cfi_flash: Fix spacing around casts/operators

[u-boot] / drivers / power / axp209.c

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index bb5d08b89da3f1a94d3c427031068cf5cd37b73f..4b25ef25780e9112c02e3818e1ecffc96b2060cb 100644 (file)
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
 
@@ -24,6 +25,14 @@ int axp_set_dcdc2(unsigned int mvolt)
        int rc;
        u8 cfg, current;
 
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+                                       AXP209_OUTPUT_CTRL_DCDC2);
+
+       rc = pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_DCDC2);
+       if (rc)
+               return rc;
+
        cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25);
 
        /* Do we really need to be this gentle? It has built-in voltage slope */
@@ -45,8 +54,17 @@ int axp_set_dcdc2(unsigned int mvolt)
 int axp_set_dcdc3(unsigned int mvolt)
 {
        u8 cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
+       int rc;
 
-       return pmic_bus_write(AXP209_DCDC3_VOLTAGE, cfg);
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+                                       AXP209_OUTPUT_CTRL_DCDC3);
+
+       rc = pmic_bus_write(AXP209_DCDC3_VOLTAGE, cfg);
+       if (rc)
+               return rc;
+
+       return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_DCDC3);
 }
 
 int axp_set_aldo2(unsigned int mvolt)
@@ -54,6 +72,10 @@ int axp_set_aldo2(unsigned int mvolt)
        int rc;
        u8 cfg, reg;
 
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+                                       AXP209_OUTPUT_CTRL_LDO2);
+
        cfg = axp209_mvolt_to_cfg(mvolt, 1800, 3300, 100);
 
        rc = pmic_bus_read(AXP209_LDO24_VOLTAGE, &reg);
@@ -62,19 +84,32 @@ int axp_set_aldo2(unsigned int mvolt)
 
        /* LDO2 configuration is in upper 4 bits */
        reg = (reg & 0x0f) | (cfg << 4);
-       return pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+       rc = pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+       if (rc)
+               return rc;
+
+       return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO2);
 }
 
 int axp_set_aldo3(unsigned int mvolt)
 {
        u8 cfg;
+       int rc;
+
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+                                       AXP209_OUTPUT_CTRL_LDO3);
 
        if (mvolt == -1)
                cfg = 0x80;     /* determined by LDO3IN pin */
        else
                cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
 
-       return pmic_bus_write(AXP209_LDO3_VOLTAGE, cfg);
+       rc = pmic_bus_write(AXP209_LDO3_VOLTAGE, cfg);
+       if (rc)
+               return rc;
+
+       return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO3);
 }
 
 int axp_set_aldo4(unsigned int mvolt)
@@ -86,6 +121,10 @@ int axp_set_aldo4(unsigned int mvolt)
        };
        u8 cfg, reg;
 
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+                                       AXP209_OUTPUT_CTRL_LDO4);
+
        /* Translate mvolt to register cfg value, requested <= selected */
        for (cfg = 15; vindex[cfg] > mvolt && cfg > 0; cfg--);
 
@@ -95,7 +134,11 @@ int axp_set_aldo4(unsigned int mvolt)
 
        /* LDO4 configuration is in lower 4 bits */
        reg = (reg & 0xf0) | (cfg << 0);
-       return pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+       rc = pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+       if (rc)
+               return rc;
+
+       return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO4);
 }
 
 int axp_init(void)
@@ -115,7 +158,7 @@ int axp_init(void)
        ver &= 0x0f;
 
        if (ver != 0x1)
-               return -1;
+               return -EINVAL;
 
        /* Mask all interrupts */
        for (i = AXP209_IRQ_ENABLE1; i <= AXP209_IRQ_ENABLE5; i++) {
@@ -124,5 +167,32 @@ int axp_init(void)
                        return rc;
        }
 
+       /*
+        * Turn off LDOIO regulators / tri-state GPIO pins, when rebooting
+        * from android these are sometimes on.
+        */
+       rc = pmic_bus_write(AXP_GPIO0_CTRL, AXP_GPIO_CTRL_INPUT);
+       if (rc)
+               return rc;
+
+       rc = pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT);
+       if (rc)
+               return rc;
+
+       rc = pmic_bus_write(AXP_GPIO2_CTRL, AXP_GPIO_CTRL_INPUT);
+       if (rc)
+               return rc;
+
+       return 0;
+}
+
+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       pmic_bus_write(AXP209_SHUTDOWN, AXP209_POWEROFF);
+
+       /* infinite loop during shutdown */
+       while (1) {}
+
+       /* not reached */
        return 0;
 }