power: pmic: sunxi: use generic AXP SPL driver for AXP305

The generic AXP SPL driver implementation can cover all regulators we
need for the AXP305.

Add the descriptions for four of the six DC/DC regulators of the AXP305,
and enable that when CONFIG_AXP305_POWER is enabled. We won't need DCDC2
and DCDC3, but by using the position in the array for the index we keep
the code cleaner.
Also remove the old driver, and switch the Makefile to include the new,
generic driver.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 312edec041957747e7c7149e76b6609656938103..9f94df8d64143c4ed26ff5e23ab0c68337f0603b 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -12,7 +12,7 @@ obj-$(CONFIG_AXP221_POWER)    += axp221.o
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_AXP152_POWER)     += axp152.o
 obj-$(CONFIG_AXP209_POWER)     += axp209.o
-obj-$(CONFIG_AXP305_POWER)     += axp305.o
+obj-$(CONFIG_AXP305_POWER)     += axp_spl.o
 obj-$(CONFIG_AXP313_POWER)     += axp_spl.o
 obj-$(CONFIG_AXP717_POWER)     += axp_spl.o
 obj-$(CONFIG_AXP809_POWER)     += axp809.o

diff --git a/drivers/power/axp305.c b/drivers/power/axp305.c
deleted file mode 100644 (file)
index 0312ad9..0000000
--- a/drivers/power/axp305.c
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * AXP305 driver
- *
- * (C) Copyright 2020 Jernej Skrabec <jernej.skrabec@siol.net>
- *
- * Based on axp221.c
- * (C) Copyright 2014 Hans de Goede <hdegoede@redhat.com>
- * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
- */
-
-#include <command.h>
-#include <errno.h>
-#include <asm/arch/pmic_bus.h>
-#include <axp_pmic.h>
-
-#define AXP305_DCDC4_1600MV_OFFSET 46
-
-static u8 axp305_mvolt_to_cfg(int mvolt, int min, int max, int div)
-{
-       if (mvolt < min)
-               mvolt = min;
-       else if (mvolt > max)
-               mvolt = max;
-
-       return  (mvolt - min) / div;
-}
-
-int axp_set_dcdc4(unsigned int mvolt)
-{
-       int ret;
-       u8 cfg;
-
-       if (mvolt >= 1600)
-               cfg = AXP305_DCDC4_1600MV_OFFSET +
-                       axp305_mvolt_to_cfg(mvolt, 1600, 3300, 100);
-       else
-               cfg = axp305_mvolt_to_cfg(mvolt, 600, 1500, 20);
-
-       if (mvolt == 0)
-               return pmic_bus_clrbits(AXP305_OUTPUT_CTRL1,
-                                       AXP305_OUTPUT_CTRL1_DCDCD_EN);
-
-       ret = pmic_bus_write(AXP305_DCDCD_VOLTAGE, cfg);
-       if (ret)
-               return ret;
-
-       return pmic_bus_setbits(AXP305_OUTPUT_CTRL1,
-                               AXP305_OUTPUT_CTRL1_DCDCD_EN);
-}
-
-int axp_init(void)
-{
-       u8 axp_chip_id;
-       int ret;
-
-       ret = pmic_bus_init();
-       if (ret)
-               return ret;
-
-       ret = pmic_bus_read(AXP305_CHIP_VERSION, &axp_chip_id);
-       if (ret)
-               return ret;
-
-       if ((axp_chip_id & AXP305_CHIP_VERSION_MASK) != 0x40)
-               return -ENODEV;
-
-       return ret;
-}
-
-#if !CONFIG_IS_ENABLED(ARM_PSCI_FW) && !IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF)
-int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       pmic_bus_write(AXP305_SHUTDOWN, AXP305_POWEROFF);
-
-       /* infinite loop during shutdown */
-       while (1) {}
-
-       /* not reached */
-       return 0;
-}
-#endif

diff --git a/drivers/power/axp_spl.c b/drivers/power/axp_spl.c
index 68cbf60eedfdbdb0ca07e5a12d80c059035077dc..3c86eb20ab439d904690bea978ca1d7977d11df1 100644 (file)
--- a/drivers/power/axp_spl.c
+++ b/drivers/power/axp_spl.c
@@ -50,6 +50,22 @@ static const struct axp_reg_desc_spl axp_spl_dcdc_regulators[] = {
 #define AXP_SHUTDOWN_REG       0x1a
 #define AXP_SHUTDOWN_MASK      BIT(7)
 
+#elif defined(CONFIG_AXP305_POWER)                             /* AXP305 */
+
+static const struct axp_reg_desc_spl axp_spl_dcdc_regulators[] = {
+       { 0x10, BIT(0), 0x12, 0x7f,  600, 1520,  10, 50 },
+       { 0x10, BIT(1), 0x13, 0x1f, 1000, 2550,  50, NA },
+       { 0x10, BIT(2), 0x14, 0x7f,  600, 1520,  10, 50 },
+       { 0x10, BIT(3), 0x15, 0x3f,  600, 1500,  20, NA },
+       { 0x10, BIT(4), 0x16, 0x1f, 1100, 3400, 100, NA },
+};
+
+#define AXP_CHIP_VERSION       0x3
+#define AXP_CHIP_VERSION_MASK  0xcf
+#define AXP_CHIP_ID            0x40
+#define AXP_SHUTDOWN_REG       0x32
+#define AXP_SHUTDOWN_MASK      BIT(7)
+
 #else
 
        #error "Please define the regulator registers in axp_spl_regulators[]."