sunxi: power: Use pmic_bus functions for axp152 / axp209 driver

Use the generic pmic_bus helpers for the axp152 / axp209 drivers,
rather then having them define their own register read / write
functions.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c
index c60e4d3..2972586 100644 (file)
--- a/drivers/power/axp152.c
+++ b/drivers/power/axp152.c
@@ -5,19 +5,9 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
-#include <i2c.h>
+#include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
 
-static int axp152_write(enum axp152_reg reg, u8 val)
-{
-       return i2c_write(0x30, reg, 1, &val, 1);
-}
-
-static int axp152_read(enum axp152_reg reg, u8 *val)
-{
-       return i2c_read(0x30, reg, 1, val, 1);
-}
-
 static u8 axp152_mvolt_to_target(int mvolt, int min, int max, int div)
 {
        if (mvolt < min)
@@ -36,13 +26,13 @@ int axp_set_dcdc2(unsigned int mvolt)
        target = axp152_mvolt_to_target(mvolt, 700, 2275, 25);
 
        /* Do we really need to be this gentle? It has built-in voltage slope */
-       while ((rc = axp152_read(AXP152_DCDC2_VOLTAGE, &current)) == 0 &&
+       while ((rc = pmic_bus_read(AXP152_DCDC2_VOLTAGE, &current)) == 0 &&
               current != target) {
                if (current < target)
                        current++;
                else
                        current--;
-               rc = axp152_write(AXP152_DCDC2_VOLTAGE, current);
+               rc = pmic_bus_write(AXP152_DCDC2_VOLTAGE, current);
                if (rc)
                        break;
        }
@@ -53,21 +43,21 @@ int axp_set_dcdc3(unsigned int mvolt)
 {
        u8 target = axp152_mvolt_to_target(mvolt, 700, 3500, 50);
 
-       return axp152_write(AXP152_DCDC3_VOLTAGE, target);
+       return pmic_bus_write(AXP152_DCDC3_VOLTAGE, target);
 }
 
 int axp_set_dcdc4(unsigned int mvolt)
 {
        u8 target = axp152_mvolt_to_target(mvolt, 700, 3500, 25);
 
-       return axp152_write(AXP152_DCDC4_VOLTAGE, target);
+       return pmic_bus_write(AXP152_DCDC4_VOLTAGE, target);
 }
 
 int axp_set_aldo2(unsigned int mvolt)
 {
        u8 target = axp152_mvolt_to_target(mvolt, 700, 3500, 100);
 
-       return axp152_write(AXP152_LDO2_VOLTAGE, target);
+       return pmic_bus_write(AXP152_LDO2_VOLTAGE, target);
 }
 
 int axp_init(void)
@@ -75,7 +65,11 @@ int axp_init(void)
        u8 ver;
        int rc;
 
-       rc = axp152_read(AXP152_CHIP_VERSION, &ver);
+       rc = pmic_bus_init();
+       if (rc)
+               return rc;
+
+       rc = pmic_bus_read(AXP152_CHIP_VERSION, &ver);
        if (rc)
                return rc;
 

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index 91c35fa..bb5d08b 100644 (file)
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -6,19 +6,9 @@
  */
 
 #include <common.h>
-#include <i2c.h>
+#include <asm/arch/pmic_bus.h>
 #include <axp_pmic.h>
 
-static int axp209_write(enum axp209_reg reg, u8 val)
-{
-       return i2c_write(0x34, reg, 1, &val, 1);
-}
-
-static int axp209_read(enum axp209_reg reg, u8 *val)
-{
-       return i2c_read(0x34, reg, 1, val, 1);
-}
-
 static u8 axp209_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
        if (mvolt < min)
@@ -37,14 +27,14 @@ int axp_set_dcdc2(unsigned int mvolt)
        cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25);
 
        /* Do we really need to be this gentle? It has built-in voltage slope */
-       while ((rc = axp209_read(AXP209_DCDC2_VOLTAGE, &current)) == 0 &&
+       while ((rc = pmic_bus_read(AXP209_DCDC2_VOLTAGE, &current)) == 0 &&
               current != cfg) {
                if (current < cfg)
                        current++;
                else
                        current--;
 
-               rc = axp209_write(AXP209_DCDC2_VOLTAGE, current);
+               rc = pmic_bus_write(AXP209_DCDC2_VOLTAGE, current);
                if (rc)
                        break;
        }
@@ -56,7 +46,7 @@ int axp_set_dcdc3(unsigned int mvolt)
 {
        u8 cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
 
-       return axp209_write(AXP209_DCDC3_VOLTAGE, cfg);
+       return pmic_bus_write(AXP209_DCDC3_VOLTAGE, cfg);
 }
 
 int axp_set_aldo2(unsigned int mvolt)
@@ -66,13 +56,13 @@ int axp_set_aldo2(unsigned int mvolt)
 
        cfg = axp209_mvolt_to_cfg(mvolt, 1800, 3300, 100);
 
-       rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+       rc = pmic_bus_read(AXP209_LDO24_VOLTAGE, &reg);
        if (rc)
                return rc;
 
        /* LDO2 configuration is in upper 4 bits */
        reg = (reg & 0x0f) | (cfg << 4);
-       return axp209_write(AXP209_LDO24_VOLTAGE, reg);
+       return pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
 }
 
 int axp_set_aldo3(unsigned int mvolt)
@@ -84,7 +74,7 @@ int axp_set_aldo3(unsigned int mvolt)
        else
                cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
 
-       return axp209_write(AXP209_LDO3_VOLTAGE, cfg);
+       return pmic_bus_write(AXP209_LDO3_VOLTAGE, cfg);
 }
 
 int axp_set_aldo4(unsigned int mvolt)
@@ -99,13 +89,13 @@ int axp_set_aldo4(unsigned int mvolt)
        /* Translate mvolt to register cfg value, requested <= selected */
        for (cfg = 15; vindex[cfg] > mvolt && cfg > 0; cfg--);
 
-       rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+       rc = pmic_bus_read(AXP209_LDO24_VOLTAGE, &reg);
        if (rc)
                return rc;
 
        /* LDO4 configuration is in lower 4 bits */
        reg = (reg & 0xf0) | (cfg << 0);
-       return axp209_write(AXP209_LDO24_VOLTAGE, reg);
+       return pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
 }
 
 int axp_init(void)
@@ -113,7 +103,11 @@ int axp_init(void)
        u8 ver;
        int i, rc;
 
-       rc = axp209_read(AXP209_CHIP_VERSION, &ver);
+       rc = pmic_bus_init();
+       if (rc)
+               return rc;
+
+       rc = pmic_bus_read(AXP209_CHIP_VERSION, &ver);
        if (rc)
                return rc;
 
@@ -125,7 +119,7 @@ int axp_init(void)
 
        /* Mask all interrupts */
        for (i = AXP209_IRQ_ENABLE1; i <= AXP209_IRQ_ENABLE5; i++) {
-               rc = axp209_write(i, 0);
+               rc = pmic_bus_write(i, 0);
                if (rc)
                        return rc;
        }