power: axp: merge separate DLDO functions into 1

Instead of one function for each DLDO regulator, make 1 function that
takes an extra "index". Since the control bits for the DLDO regulators
are contiguous, this makes the function very simple. This removes a lot
of duplicate code.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 1cc39e4d1840e8f0a98ae61269b0a5d3bd11d926..958f5c5bae4640a093b0f17ff8c0c367ef295be7 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -466,10 +466,10 @@ void sunxi_board_init(void)
 #endif
 
 #ifdef CONFIG_AXP221_POWER
-       power_failed |= axp_set_dldo1(CONFIG_AXP_DLDO1_VOLT);
-       power_failed |= axp_set_dldo2(CONFIG_AXP_DLDO2_VOLT);
-       power_failed |= axp_set_dldo3(CONFIG_AXP_DLDO3_VOLT);
-       power_failed |= axp_set_dldo4(CONFIG_AXP_DLDO4_VOLT);
+       power_failed |= axp_set_dldo(1, CONFIG_AXP_DLDO1_VOLT);
+       power_failed |= axp_set_dldo(2, CONFIG_AXP_DLDO2_VOLT);
+       power_failed |= axp_set_dldo(3, CONFIG_AXP_DLDO3_VOLT);
+       power_failed |= axp_set_dldo(4, CONFIG_AXP_DLDO4_VOLT);
        power_failed |= axp_set_eldo(1, CONFIG_AXP_ELDO1_VOLT);
        power_failed |= axp_set_eldo(2, CONFIG_AXP_ELDO2_VOLT);
        power_failed |= axp_set_eldo(3, CONFIG_AXP_ELDO3_VOLT);

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 8acadf0f9c52fc700170645e7f1e0c748df38373..cb1f88b185ccacc802394b6706c0fa6864b9b3ff 100644 (file)
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -116,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;
@@ -235,6 +167,26 @@ 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;

diff --git a/include/axp_pmic.h b/include/axp_pmic.h
index 3b01c49cc935def3eb6a5d4a1585acbe396b5855..0f146835091b2784949c6f404c97b6a644528597 100644 (file)
--- a/include/axp_pmic.h
+++ b/include/axp_pmic.h
@@ -29,10 +29,7 @@ int axp_set_aldo1(unsigned int mvolt);
 int axp_set_aldo2(unsigned int mvolt);
 int axp_set_aldo3(unsigned int mvolt);
 int axp_set_aldo4(unsigned int mvolt);
-int axp_set_dldo1(unsigned int mvolt);
-int axp_set_dldo2(unsigned int mvolt);
-int axp_set_dldo3(unsigned int mvolt);
-int axp_set_dldo4(unsigned int mvolt);
+int axp_set_dldo(int dldo_num, unsigned int mvolt);
 int axp_set_eldo(int eldo_num, unsigned int mvolt);
 int axp_init(void);
 int axp_get_sid(unsigned int *sid);