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

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

diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c
index 4b21a838798558220d786d28fadcc702b78f3d1f..e885d029840335d42a60184c72d3af7fd2b2cf47 100644 (file)
--- a/drivers/power/axp818.c
+++ b/drivers/power/axp818.c
@@ -110,6 +110,87 @@ int axp_set_dcdc5(unsigned int mvolt)
                                AXP818_OUTPUT_CTRL1_DCDC5_EN);
 }
 
+int axp_set_aldo(int aldo_num, unsigned int mvolt)
+{
+       int ret;
+       u8 cfg;
+
+       if (aldo_num < 1 || aldo_num > 3)
+               return -EINVAL;
+
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP818_OUTPUT_CTRL3,
+                               AXP818_OUTPUT_CTRL3_ALDO1_EN << (aldo_num - 1));
+
+       cfg = axp818_mvolt_to_cfg(mvolt, 700, 3300, 100);
+       ret = pmic_bus_write(AXP818_ALDO1_CTRL + (aldo_num - 1), cfg);
+       if (ret)
+               return ret;
+
+       return pmic_bus_setbits(AXP818_OUTPUT_CTRL3,
+                               AXP818_OUTPUT_CTRL3_ALDO1_EN << (aldo_num - 1));
+}
+
+/* TODO: re-work other AXP drivers to consolidate ALDO functions. */
+int axp_set_aldo1(unsigned int mvolt)
+{
+       return axp_set_aldo(1, mvolt);
+}
+
+int axp_set_aldo2(unsigned int mvolt)
+{
+       return axp_set_aldo(2, mvolt);
+}
+
+int axp_set_aldo3(unsigned int mvolt)
+{
+       return axp_set_aldo(3, mvolt);
+}
+
+int axp_set_dldo(int dldo_num, unsigned int mvolt)
+{
+       int ret;
+       u8 cfg;
+
+       if (dldo_num < 1 || dldo_num > 4)
+               return -EINVAL;
+
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP818_OUTPUT_CTRL2,
+                               AXP818_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
+
+       cfg = axp818_mvolt_to_cfg(mvolt, 700, 3300, 100);
+       if (dldo_num == 2 && mvolt > 3300)
+               cfg += 1 + axp818_mvolt_to_cfg(mvolt, 3400, 4200, 200);
+       ret = pmic_bus_write(AXP818_ELDO1_CTRL + (dldo_num - 1), cfg);
+       if (ret)
+               return ret;
+
+       return pmic_bus_setbits(AXP818_OUTPUT_CTRL2,
+                               AXP818_OUTPUT_CTRL2_DLDO1_EN << (dldo_num - 1));
+}
+
+int axp_set_eldo(int eldo_num, unsigned int mvolt)
+{
+       int ret;
+       u8 cfg;
+
+       if (eldo_num < 1 || eldo_num > 3)
+               return -EINVAL;
+
+       if (mvolt == 0)
+               return pmic_bus_clrbits(AXP818_OUTPUT_CTRL2,
+                               AXP818_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));
+
+       cfg = axp818_mvolt_to_cfg(mvolt, 700, 1900, 50);
+       ret = pmic_bus_write(AXP818_ELDO1_CTRL + (eldo_num - 1), cfg);
+       if (ret)
+               return ret;
+
+       return pmic_bus_setbits(AXP818_OUTPUT_CTRL2,
+                               AXP818_OUTPUT_CTRL2_ELDO1_EN << (eldo_num - 1));
+}
+
 int axp_init(void)
 {
        u8 axp_chip_id;