Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[karo-tx-uboot.git] / drivers / power / twl4030.c

diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 36b2144947a2b93f23c21df7ea0cec0a7843c541..7f1fdd1534c079638d16f2e8967ad0b4571276e0 100644 (file)
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -2,20 +2,7 @@
  * Copyright (c) 2009 Wind River Systems, Inc.
  * Tom Rix <Tom.Rix at windriver.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * twl4030_power_reset_init is derived from code on omapzoom,
  * git://git.omapzoom.com/repo/u-boot.git
@@ -34,7 +21,6 @@
  * Derived from Beagle Board and 3430 SDP code by
  *     Richard Woodruff <r-woodruff2 at ti.com>
  *     Syed Mohammed Khasim <khasim at ti.com>
- *
  */
 
 #include <twl4030.h>
@@ -45,14 +31,14 @@
 void twl4030_power_reset_init(void)
 {
        u8 val = 0;
-       if (twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER, &val,
-                               TWL4030_PM_MASTER_P1_SW_EVENTS)) {
+       if (twl4030_i2c_read_u8(TWL4030_CHIP_PM_MASTER,
+                               TWL4030_PM_MASTER_P1_SW_EVENTS, &val)) {
                printf("Error:TWL4030: failed to read the power register\n");
                printf("Could not initialize hardware reset\n");
        } else {
                val |= TWL4030_PM_MASTER_SW_EVENTS_STOPON_PWRON;
-               if (twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER, val,
-                                        TWL4030_PM_MASTER_P1_SW_EVENTS)) {
+               if (twl4030_i2c_write_u8(TWL4030_CHIP_PM_MASTER,
+                                        TWL4030_PM_MASTER_P1_SW_EVENTS, val)) {
                        printf("Error:TWL4030: failed to write the power register\n");
                        printf("Could not initialize hardware reset\n");
                }
@@ -68,19 +54,19 @@ void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val,
        int ret;
 
        /* Select the Voltage */
-       ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val,
-                               vsel_reg);
+       ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_reg,
+                                  vsel_val);
        if (ret != 0) {
-               printf("Could could not write vsel to reg %02x (%d)\n",
+               printf("Could not write vsel to reg %02x (%d)\n",
                        vsel_reg, ret);
                return;
        }
 
        /* Select the Device Group (enable the supply if dev_grp_sel != 0) */
-       ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel,
-                               dev_grp);
+       ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp,
+                                  dev_grp_sel);
        if (ret != 0)
-               printf("Could could not write grp_sel to reg %02x (%d)\n",
+               printf("Could not write grp_sel to reg %02x (%d)\n",
                        dev_grp, ret);
 }
 
@@ -105,11 +91,23 @@ void twl4030_power_init(void)
                                TWL4030_PM_RECEIVER_DEV_GRP_P1);
 }
 
-void twl4030_power_mmc_init(void)
+void twl4030_power_mmc_init(int dev_index)
 {
-       /* Set VMMC1 to 3.15 Volts */
-       twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VMMC1_DEDICATED,
-                               TWL4030_PM_RECEIVER_VMMC1_VSEL_32,
-                               TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
-                               TWL4030_PM_RECEIVER_DEV_GRP_P1);
+       if (dev_index == 0) {
+               /* Set VMMC1 to 3.15 Volts */
+               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VMMC1_DEDICATED,
+                                       TWL4030_PM_RECEIVER_VMMC1_VSEL_32,
+                                       TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
+                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
+
+               mdelay(100);    /* ramp-up delay from Linux code */
+       } else if (dev_index == 1) {
+               /* Set VMMC2 to 3.15 Volts */
+               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VMMC2_DEDICATED,
+                                       TWL4030_PM_RECEIVER_VMMC2_VSEL_32,
+                                       TWL4030_PM_RECEIVER_VMMC2_DEV_GRP,
+                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
+
+               mdelay(100);    /* ramp-up delay from Linux code */
+       }
 }