Merge git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / drivers / power / axp221.c

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 65802e4a713f9eec76dfc41d18a0db048160544b..109d3f468631d213e480c006f4796497c6df8680 100644 (file)
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <errno.h>
 #include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
@@ -115,74 +116,6 @@ int axp_set_dcdc5(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC5_EN);
 }
 
-int axp_set_dldo1(unsigned int mvolt)
-{
-       int ret;
-       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
-
-       if (mvolt == 0)
-               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
-                                       AXP221_OUTPUT_CTRL2_DLDO1_EN);
-
-       ret = pmic_bus_write(AXP221_DLDO1_CTRL, cfg);
-       if (ret)
-               return ret;
-
-       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
-                               AXP221_OUTPUT_CTRL2_DLDO1_EN);
-}
-
-int axp_set_dldo2(unsigned int mvolt)
-{
-       int ret;
-       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
-
-       if (mvolt == 0)
-               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
-                                       AXP221_OUTPUT_CTRL2_DLDO2_EN);
-
-       ret = pmic_bus_write(AXP221_DLDO2_CTRL, cfg);
-       if (ret)
-               return ret;
-
-       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
-                               AXP221_OUTPUT_CTRL2_DLDO2_EN);
-}
-
-int axp_set_dldo3(unsigned int mvolt)
-{
-       int ret;
-       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
-
-       if (mvolt == 0)
-               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
-                                       AXP221_OUTPUT_CTRL2_DLDO3_EN);
-
-       ret = pmic_bus_write(AXP221_DLDO3_CTRL, cfg);
-       if (ret)
-               return ret;
-
-       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
-                               AXP221_OUTPUT_CTRL2_DLDO3_EN);
-}
-
-int axp_set_dldo4(unsigned int mvolt)
-{
-       int ret;
-       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
-
-       if (mvolt == 0)
-               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
-                                       AXP221_OUTPUT_CTRL2_DLDO4_EN);
-
-       ret = pmic_bus_write(AXP221_DLDO4_CTRL, cfg);
-       if (ret)
-               return ret;
-
-       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
-                               AXP221_OUTPUT_CTRL2_DLDO4_EN);
-}
-
 int axp_set_aldo1(unsigned int mvolt)
 {
        int ret;
@@ -234,37 +167,44 @@ int axp_set_aldo3(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL3_ALDO3_EN);
 }
 
+int axp_set_dldo(int dldo_num, unsigned int mvolt)
+{
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+       int ret;
+
+       if (dldo_num < 1 || dldo_num > 4)
+               return -EINVAL;
+
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+                               AXP221_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
+
+       ret = pmic_bus_write(AXP221_DLDO1_CTRL + (dldo_num - 1), cfg);
+       if (ret)
+               return ret;
+
+       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+                               AXP221_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
+}
+
 int axp_set_eldo(int eldo_num, unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
-       u8 addr, bits;
-
-       switch (eldo_num) {
-       case 3:
-               addr = AXP221_ELDO3_CTRL;
-               bits = AXP221_OUTPUT_CTRL2_ELDO3_EN;
-               break;
-       case 2:
-               addr = AXP221_ELDO2_CTRL;
-               bits = AXP221_OUTPUT_CTRL2_ELDO2_EN;
-               break;
-       case 1:
-               addr = AXP221_ELDO1_CTRL;
-               bits = AXP221_OUTPUT_CTRL2_ELDO1_EN;
-               break;
-       default:
+
+       if (eldo_num < 1 || eldo_num > 3)
                return -EINVAL;
-       }
 
        if (mvolt == 0)
-               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2, bits);
+               return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+                               AXP221_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));
 
-       ret = pmic_bus_write(addr, cfg);
+       ret = pmic_bus_write(AXP221_ELDO1_CTRL + (eldo_num - 1), cfg);
        if (ret)
                return ret;
 
-       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2, bits);
+       return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+                               AXP221_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));
 }
 
 int axp_init(void)
@@ -283,6 +223,18 @@ int axp_init(void)
        if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
                return -ENODEV;
 
+       /*
+        * Turn off LDOIO regulators / tri-state GPIO pins, when rebooting
+        * from android these are sometimes on.
+        */
+       ret = pmic_bus_write(AXP_GPIO0_CTRL, AXP_GPIO_CTRL_INPUT);
+       if (ret)
+               return ret;
+
+       ret = pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT);
+       if (ret)
+               return ret;
+
        return 0;
 }
 
@@ -312,3 +264,14 @@ int axp_get_sid(unsigned int *sid)
 
        return 0;
 }
+
+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       pmic_bus_write(AXP221_SHUTDOWN, AXP221_SHUTDOWN_POWEROFF);
+
+       /* infinite loop during shutdown */
+       while (1) {}
+
+       /* not reached */
+       return 0;
+}