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

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

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index d49de86e972b613211671f66c8d2200ba5f51a95..cb1f88b185ccacc802394b6706c0fa6864b9b3ff 100644 (file)
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -11,10 +11,10 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <errno.h>
-#include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
-#include <axp221.h>
+#include <axp_pmic.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
@@ -26,7 +26,7 @@ static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
        return (mvolt - min) / div;
 }
 
-int axp221_set_dcdc1(unsigned int mvolt)
+int axp_set_dcdc1(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
@@ -48,7 +48,7 @@ int axp221_set_dcdc1(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC1_EN);
 }
 
-int axp221_set_dcdc2(unsigned int mvolt)
+int axp_set_dcdc2(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
@@ -65,7 +65,7 @@ int axp221_set_dcdc2(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC2_EN);
 }
 
-int axp221_set_dcdc3(unsigned int mvolt)
+int axp_set_dcdc3(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);
@@ -82,7 +82,7 @@ int axp221_set_dcdc3(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC3_EN);
 }
 
-int axp221_set_dcdc4(unsigned int mvolt)
+int axp_set_dcdc4(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
@@ -99,7 +99,7 @@ int axp221_set_dcdc4(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC4_EN);
 }
 
-int axp221_set_dcdc5(unsigned int mvolt)
+int axp_set_dcdc5(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);
@@ -116,75 +116,7 @@ int axp221_set_dcdc5(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_DCDC5_EN);
 }
 
-int axp221_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 axp221_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 axp221_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 axp221_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 axp221_set_aldo1(unsigned int mvolt)
+int axp_set_aldo1(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
@@ -201,7 +133,7 @@ int axp221_set_aldo1(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_ALDO1_EN);
 }
 
-int axp221_set_aldo2(unsigned int mvolt)
+int axp_set_aldo2(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
@@ -218,7 +150,7 @@ int axp221_set_aldo2(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL1_ALDO2_EN);
 }
 
-int axp221_set_aldo3(unsigned int mvolt)
+int axp_set_aldo3(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
@@ -235,7 +167,27 @@ int axp221_set_aldo3(unsigned int mvolt)
                                AXP221_OUTPUT_CTRL3_ALDO3_EN);
 }
 
-int axp221_set_eldo(int eldo_num, unsigned int mvolt)
+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);
@@ -268,16 +220,11 @@ int axp221_set_eldo(int eldo_num, unsigned int mvolt)
        return pmic_bus_setbits(AXP221_OUTPUT_CTRL2, bits);
 }
 
-int axp221_init(void)
+int axp_init(void)
 {
-       /* This cannot be 0 because it is used in SPL before BSS is ready */
-       static int needs_init = 1;
        u8 axp_chip_id;
        int ret;
 
-       if (!needs_init)
-               return 0;
-
        ret = pmic_bus_init();
        if (ret)
                return ret;
@@ -289,16 +236,15 @@ int axp221_init(void)
        if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
                return -ENODEV;
 
-       needs_init = 0;
        return 0;
 }
 
-int axp221_get_sid(unsigned int *sid)
+int axp_get_sid(unsigned int *sid)
 {
        u8 *dest = (u8 *)sid;
        int i, ret;
 
-       ret = axp221_init();
+       ret = pmic_bus_init();
        if (ret)
                return ret;
 
@@ -320,66 +266,13 @@ int axp221_get_sid(unsigned int *sid)
        return 0;
 }
 
-int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       switch (pin) {
-       case SUNXI_GPIO_AXP0_VBUS_DETECT:
-               return 0;
-       default:
-               return -EINVAL;
-       }
-}
-
-int axp_gpio_direction_output(struct udevice *dev, unsigned pin, int val)
-{
-       int ret;
+       pmic_bus_write(AXP221_SHUTDOWN, AXP221_SHUTDOWN_POWEROFF);
 
-       switch (pin) {
-       case SUNXI_GPIO_AXP0_VBUS_ENABLE:
-               ret = axp221_clrbits(AXP221_MISC_CTRL,
-                                    AXP221_MISC_CTRL_N_VBUSEN_FUNC);
-               if (ret)
-                       return ret;
-
-               return axp_gpio_set_value(dev, pin, val);
-       default:
-               return -EINVAL;
-       }
-}
-
-int axp_gpio_get_value(struct udevice *dev, unsigned pin)
-{
-       int ret;
-       u8 val;
-
-       switch (pin) {
-       case SUNXI_GPIO_AXP0_VBUS_DETECT:
-               ret = pmic_bus_read(AXP221_POWER_STATUS, &val);
-               if (ret)
-                       return ret;
-
-               return !!(val & AXP221_POWER_STATUS_VBUS_AVAIL);
-       default:
-               return -EINVAL;
-       }
-}
-
-int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
-{
-       int ret;
-
-       switch (pin) {
-       case SUNXI_GPIO_AXP0_VBUS_ENABLE:
-               if (val)
-                       ret = axp221_setbits(AXP221_VBUS_IPSOUT,
-                                            AXP221_VBUS_IPSOUT_DRIVEBUS);
-               else
-                       ret = axp221_clrbits(AXP221_VBUS_IPSOUT,
-                                            AXP221_VBUS_IPSOUT_DRIVEBUS);
-
-               if (ret)
-                       return ret;
-       }
+       /* infinite loop during shutdown */
+       while (1) {}
 
+       /* not reached */
        return 0;
 }