at91sam9263ek: remove unnecessary console_init_f

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

diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 1a5408959e11cc8ec3791f2da9db80f4547bdf5a..36b2144947a2b93f23c21df7ea0cec0a7843c541 100644 (file)
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -65,13 +65,23 @@ void twl4030_power_reset_init(void)
 void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val,
                                u8 dev_grp, u8 dev_grp_sel)
 {
-       /* Select the Device Group */
-       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel,
-                               dev_grp);
+       int ret;
 
        /* Select the Voltage */
-       twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val,
+       ret = twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val,
                                vsel_reg);
+       if (ret != 0) {
+               printf("Could 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);
+       if (ret != 0)
+               printf("Could could not write grp_sel to reg %02x (%d)\n",
+                       dev_grp, ret);
 }
 
 void twl4030_power_init(void)
@@ -97,10 +107,9 @@ void twl4030_power_init(void)
 
 void twl4030_power_mmc_init(void)
 {
-       /* Set VMMC1 to 3 Volts */
+       /* Set VMMC1 to 3.15 Volts */
        twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VMMC1_DEDICATED,
-                               TWL4030_PM_RECEIVER_VMMC1_VSEL_30,
+                               TWL4030_PM_RECEIVER_VMMC1_VSEL_32,
                                TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
                                TWL4030_PM_RECEIVER_DEV_GRP_P1);
 }
-