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

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

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 4667579c9158a99aa0b7caf5c5c217223107e1fd..3e07f23c20c621ba9cbfc101d788462aed93026d 100644 (file)
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -29,9 +29,7 @@ static int pmic_bus_init(void)
 #else
        int ret;
 
-       rsb_init();
-
-       ret = rsb_set_device_mode(AXP223_DEVICE_MODE_DATA);
+       ret = rsb_init();
        if (ret)
                return ret;
 
@@ -80,45 +78,107 @@ static int axp221_setbits(u8 reg, u8 bits)
        return pmic_bus_write(reg, val);
 }
 
+static int axp221_clrbits(u8 reg, u8 bits)
+{
+       int ret;
+       u8 val;
+
+       ret = pmic_bus_read(reg, &val);
+       if (ret)
+               return ret;
+
+       val &= ~bits;
+       return pmic_bus_write(reg, val);
+}
+
 int axp221_set_dcdc1(unsigned int mvolt)
 {
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_DCDC1_EN);
+
        ret = pmic_bus_write(AXP221_DCDC1_CTRL, cfg);
        if (ret)
                return ret;
 
-       return axp221_setbits(AXP221_OUTPUT_CTRL2,
-                             AXP221_OUTPUT_CTRL2_DCDC1_EN);
+       ret = axp221_setbits(AXP221_OUTPUT_CTRL2,
+                            AXP221_OUTPUT_CTRL2_DCDC1SW_EN);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_DCDC1_EN);
 }
 
 int axp221_set_dcdc2(unsigned int mvolt)
 {
+       int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
 
-       return pmic_bus_write(AXP221_DCDC2_CTRL, cfg);
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_DCDC2_EN);
+
+       ret = pmic_bus_write(AXP221_DCDC2_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_DCDC2_EN);
 }
 
 int axp221_set_dcdc3(unsigned int mvolt)
 {
+       int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);
 
-       return pmic_bus_write(AXP221_DCDC3_CTRL, cfg);
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_DCDC3_EN);
+
+       ret = pmic_bus_write(AXP221_DCDC3_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_DCDC3_EN);
 }
 
 int axp221_set_dcdc4(unsigned int mvolt)
 {
+       int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
 
-       return pmic_bus_write(AXP221_DCDC4_CTRL, cfg);
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_DCDC4_EN);
+
+       ret = pmic_bus_write(AXP221_DCDC4_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_DCDC4_EN);
 }
 
 int axp221_set_dcdc5(unsigned int mvolt)
 {
+       int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);
 
-       return pmic_bus_write(AXP221_DCDC5_CTRL, cfg);
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_DCDC5_EN);
+
+       ret = pmic_bus_write(AXP221_DCDC5_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_DCDC5_EN);
 }
 
 int axp221_set_dldo1(unsigned int mvolt)
@@ -126,6 +186,10 @@ int axp221_set_dldo1(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL2,
+                                     AXP221_OUTPUT_CTRL2_DLDO1_EN);
+
        ret = pmic_bus_write(AXP221_DLDO1_CTRL, cfg);
        if (ret)
                return ret;
@@ -139,6 +203,10 @@ int axp221_set_dldo2(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL2,
+                                     AXP221_OUTPUT_CTRL2_DLDO2_EN);
+
        ret = pmic_bus_write(AXP221_DLDO2_CTRL, cfg);
        if (ret)
                return ret;
@@ -152,6 +220,10 @@ int axp221_set_dldo3(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL2,
+                                     AXP221_OUTPUT_CTRL2_DLDO3_EN);
+
        ret = pmic_bus_write(AXP221_DLDO3_CTRL, cfg);
        if (ret)
                return ret;
@@ -165,6 +237,10 @@ int axp221_set_dldo4(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL2,
+                                     AXP221_OUTPUT_CTRL2_DLDO4_EN);
+
        ret = pmic_bus_write(AXP221_DLDO4_CTRL, cfg);
        if (ret)
                return ret;
@@ -178,6 +254,10 @@ int axp221_set_aldo1(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_ALDO1_EN);
+
        ret = pmic_bus_write(AXP221_ALDO1_CTRL, cfg);
        if (ret)
                return ret;
@@ -191,6 +271,10 @@ int axp221_set_aldo2(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL1,
+                                     AXP221_OUTPUT_CTRL1_ALDO2_EN);
+
        ret = pmic_bus_write(AXP221_ALDO2_CTRL, cfg);
        if (ret)
                return ret;
@@ -204,6 +288,10 @@ int axp221_set_aldo3(unsigned int mvolt)
        int ret;
        u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL3,
+                                     AXP221_OUTPUT_CTRL3_ALDO3_EN);
+
        ret = pmic_bus_write(AXP221_ALDO3_CTRL, cfg);
        if (ret)
                return ret;
@@ -212,11 +300,49 @@ int axp221_set_aldo3(unsigned int mvolt)
                              AXP221_OUTPUT_CTRL3_ALDO3_EN);
 }
 
+int axp221_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:
+               return -EINVAL;
+       }
+
+       if (mvolt == 0)
+               return axp221_clrbits(AXP221_OUTPUT_CTRL2, bits);
+
+       ret = pmic_bus_write(addr, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2, bits);
+}
+
 int axp221_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;
@@ -228,6 +354,7 @@ int axp221_init(void)
        if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
                return -ENODEV;
 
+       needs_init = 0;
        return 0;
 }
 
@@ -257,3 +384,39 @@ int axp221_get_sid(unsigned int *sid)
 
        return 0;
 }
+
+static int axp_drivebus_setup(void)
+{
+       int ret;
+
+       ret = axp221_init();
+       if (ret)
+               return ret;
+
+       /* Set N_VBUSEN pin to output / DRIVEBUS function */
+       return axp221_clrbits(AXP221_MISC_CTRL, AXP221_MISC_CTRL_N_VBUSEN_FUNC);
+}
+
+int axp_drivebus_enable(void)
+{
+       int ret;
+
+       ret = axp_drivebus_setup();
+       if (ret)
+               return ret;
+
+       /* Set DRIVEBUS high */
+       return axp221_setbits(AXP221_VBUS_IPSOUT, AXP221_VBUS_IPSOUT_DRIVEBUS);
+}
+
+int axp_drivebus_disable(void)
+{
+       int ret;
+
+       ret = axp_drivebus_setup();
+       if (ret)
+               return ret;
+
+       /* Set DRIVEBUS low */
+       return axp221_clrbits(AXP221_VBUS_IPSOUT, AXP221_VBUS_IPSOUT_DRIVEBUS);
+}