sun6i: Add basic axp221 driver

The A31 uses the AXP221 pmic for various voltages.

Signed-off-by: Oliver Schinagl <oliver@schinagl.nl>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
--
Changes in v2:
-Rebase
Changes in v3:
-Add support for all dldo and aldo-s
-Add Kconfig option to select building AXP221 and to select voltage of
 dldo and aldo-s
Changes in v4:
-Add axp221_setbits helper function
-Use symbolic names for enabled bits in CTRL1 - CTRL3 registers

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 03890c8c9ceb62c40279c4fb910a56441858ec8a..e6ec5b8fc10b89447f6088ec1320eb0701a10108 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -19,6 +19,9 @@
 #ifdef CONFIG_AXP209_POWER
 #include <axp209.h>
 #endif
+#ifdef CONFIG_AXP221_POWER
+#include <axp221.h>
+#endif
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dram.h>
@@ -168,6 +171,29 @@ void sunxi_board_init(void)
        power_failed |= axp209_set_ldo2(3000);
        power_failed |= axp209_set_ldo3(2800);
        power_failed |= axp209_set_ldo4(2800);
+#endif
+#ifdef CONFIG_AXP221_POWER
+       power_failed = axp221_init();
+       power_failed |= axp221_set_dcdc1(3000);
+       power_failed |= axp221_set_dcdc2(1200);
+       power_failed |= axp221_set_dcdc3(1200);
+       power_failed |= axp221_set_dcdc4(1200);
+       power_failed |= axp221_set_dcdc5(1500);
+#if CONFIG_AXP221_DLDO1_VOLT != -1
+       power_failed |= axp221_set_dldo1(CONFIG_AXP221_DLDO1_VOLT);
+#endif
+#if CONFIG_AXP221_DLDO4_VOLT != -1
+       power_failed |= axp221_set_dldo4(CONFIG_AXP221_DLDO4_VOLT);
+#endif
+#if CONFIG_AXP221_ALDO1_VOLT != -1
+       power_failed |= axp221_set_aldo1(CONFIG_AXP221_ALDO1_VOLT);
+#endif
+#if CONFIG_AXP221_ALDO2_VOLT != -1
+       power_failed |= axp221_set_aldo2(CONFIG_AXP221_ALDO2_VOLT);
+#endif
+#if CONFIG_AXP221_ALDO3_VOLT != -1
+       power_failed |= axp221_set_aldo3(CONFIG_AXP221_ALDO3_VOLT);
+#endif
 #endif
 
        printf("DRAM:");

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1ec7c0e59ae0e2c28e0fa045fc1d76d40859385a 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -0,0 +1,47 @@
+config AXP221_POWER
+       boolean "axp221 pmic support"
+       depends on MACH_SUN6I
+       default y
+       ---help---
+       Say y here to enable support for the axp221 pmic found on most sun6i
+       (A31) boards.
+
+config AXP221_DLDO1_VOLT
+       int "axp221 dldo1 voltage"
+       depends on AXP221_POWER
+       default -1
+       ---help---
+       Set the voltage (mV) to program the axp221 dldo1 at, set to -1 to
+       disable dldo1.
+
+config AXP221_DLDO4_VOLT
+       int "axp221 dldo4 voltage"
+       depends on AXP221_POWER
+       default -1
+       ---help---
+       Set the voltage (mV) to program the axp221 dldo4 at, set to -1 to
+       disable dldo4.
+
+config AXP221_ALDO1_VOLT
+       int "axp221 aldo1 voltage"
+       depends on AXP221_POWER
+       default -1
+       ---help---
+       Set the voltage (mV) to program the axp221 aldo1 at, set to -1 to
+       disable aldo1.
+
+config AXP221_ALDO2_VOLT
+       int "axp221 aldo2 voltage"
+       depends on AXP221_POWER
+       default -1
+       ---help---
+       Set the voltage (mV) to program the axp221 aldo2 at, set to -1 to
+       disable aldo2.
+
+config AXP221_ALDO3_VOLT
+       int "axp221 aldo3 voltage"
+       depends on AXP221_POWER
+       default -1
+       ---help---
+       Set the voltage (mV) to program the axp221 aldo3 at, set to -1 to
+       disable aldo3.

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index dc64e4d32bffb6d56e679620e229caa1f9f14909..04bd996cad0dae6db5b23196a55c6ca5cb7e13a2 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -7,6 +7,7 @@
 
 obj-$(CONFIG_AXP152_POWER)     += axp152.o
 obj-$(CONFIG_AXP209_POWER)     += axp209.o
+obj-$(CONFIG_AXP221_POWER)     += axp221.o
 obj-$(CONFIG_EXYNOS_TMU)       += exynos-tmu.o
 obj-$(CONFIG_FTPMU010_POWER)   += ftpmu010.o
 obj-$(CONFIG_TPS6586X_POWER)   += tps6586x.o

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
new file mode 100644 (file)
index 0000000..941193a
--- /dev/null
+++ b/drivers/power/axp221.c
@@ -0,0 +1,186 @@
+/*
+ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/p2wi.h>
+#include <axp221.h>
+
+static u8 axp221_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;
+}
+
+static int axp221_setbits(u8 reg, u8 bits)
+{
+       int ret;
+       u8 val;
+
+       ret = p2wi_read(reg, &val);
+       if (ret)
+               return ret;
+
+       val |= bits;
+       return p2wi_write(reg, val);
+}
+
+int axp221_set_dcdc1(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
+
+       ret = p2wi_write(AXP221_DCDC1_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2,
+                             AXP221_OUTPUT_CTRL2_DCDC1_EN);
+}
+
+int axp221_set_dcdc2(unsigned int mvolt)
+{
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
+
+       return p2wi_write(AXP221_DCDC2_CTRL, cfg);
+}
+
+int axp221_set_dcdc3(unsigned int mvolt)
+{
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);
+
+       return p2wi_write(AXP221_DCDC3_CTRL, cfg);
+}
+
+int axp221_set_dcdc4(unsigned int mvolt)
+{
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
+
+       return p2wi_write(AXP221_DCDC4_CTRL, cfg);
+}
+
+int axp221_set_dcdc5(unsigned int mvolt)
+{
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);
+
+       return p2wi_write(AXP221_DCDC5_CTRL, cfg);
+}
+
+int axp221_set_dldo1(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_DLDO1_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2,
+                             AXP221_OUTPUT_CTRL2_DLDO1_EN);
+}
+
+int axp221_set_dldo2(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_DLDO2_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2,
+                             AXP221_OUTPUT_CTRL2_DLDO2_EN);
+}
+
+int axp221_set_dldo3(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_DLDO3_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2,
+                             AXP221_OUTPUT_CTRL2_DLDO3_EN);
+}
+
+int axp221_set_dldo4(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_DLDO4_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL2,
+                             AXP221_OUTPUT_CTRL2_DLDO4_EN);
+}
+
+int axp221_set_aldo1(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_ALDO1_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_ALDO1_EN);
+}
+
+int axp221_set_aldo2(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_ALDO2_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL1,
+                             AXP221_OUTPUT_CTRL1_ALDO2_EN);
+}
+
+int axp221_set_aldo3(unsigned int mvolt)
+{
+       int ret;
+       u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+
+       ret = p2wi_write(AXP221_ALDO3_CTRL, cfg);
+       if (ret)
+               return ret;
+
+       return axp221_setbits(AXP221_OUTPUT_CTRL3,
+                             AXP221_OUTPUT_CTRL3_ALDO3_EN);
+}
+
+int axp221_init(void)
+{
+       u8 axp_chip_id;
+       int ret;
+
+       p2wi_init();
+       ret = p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
+                                      AXP221_INIT_DATA);
+       if (ret)
+               return ret;
+
+       ret = p2wi_read(AXP221_CHIP_ID, &axp_chip_id);
+       if (ret)
+               return ret;
+
+       if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
+               return -ENODEV;
+
+       return 0;
+}

diff --git a/include/axp221.h b/include/axp221.h
new file mode 100644 (file)
index 0000000..e3b4409
--- /dev/null
+++ b/include/axp221.h
@@ -0,0 +1,50 @@
+/*
+ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
+ *
+ * X-Powers AXP221 Power Management IC driver
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#define AXP221_CHIP_ADDR 0x68
+#define AXP221_CTRL_ADDR 0x3e
+#define AXP221_INIT_DATA 0x3e
+
+#define AXP221_CHIP_ID         0x03
+#define AXP221_OUTPUT_CTRL1    0x10
+#define AXP221_OUTPUT_CTRL1_ALDO1_EN   (1 << 6)
+#define AXP221_OUTPUT_CTRL1_ALDO2_EN   (1 << 7)
+#define AXP221_OUTPUT_CTRL2    0x12
+#define AXP221_OUTPUT_CTRL2_DLDO1_EN   (1 << 3)
+#define AXP221_OUTPUT_CTRL2_DLDO2_EN   (1 << 4)
+#define AXP221_OUTPUT_CTRL2_DLDO3_EN   (1 << 5)
+#define AXP221_OUTPUT_CTRL2_DLDO4_EN   (1 << 6)
+#define AXP221_OUTPUT_CTRL2_DCDC1_EN   (1 << 7)
+#define AXP221_OUTPUT_CTRL3    0x13
+#define AXP221_OUTPUT_CTRL3_ALDO3_EN   (1 << 7)
+#define AXP221_DLDO1_CTRL      0x15
+#define AXP221_DLDO2_CTRL      0x16
+#define AXP221_DLDO3_CTRL      0x17
+#define AXP221_DLDO4_CTRL      0x18
+#define AXP221_DCDC1_CTRL      0x21
+#define AXP221_DCDC2_CTRL      0x22
+#define AXP221_DCDC3_CTRL      0x23
+#define AXP221_DCDC4_CTRL      0x24
+#define AXP221_DCDC5_CTRL      0x25
+#define AXP221_ALDO1_CTRL      0x28
+#define AXP221_ALDO2_CTRL      0x28
+#define AXP221_ALDO3_CTRL      0x2a
+
+int axp221_set_dcdc1(unsigned int mvolt);
+int axp221_set_dcdc2(unsigned int mvolt);
+int axp221_set_dcdc3(unsigned int mvolt);
+int axp221_set_dcdc4(unsigned int mvolt);
+int axp221_set_dcdc5(unsigned int mvolt);
+int axp221_set_dldo1(unsigned int mvolt);
+int axp221_set_dldo2(unsigned int mvolt);
+int axp221_set_dldo3(unsigned int mvolt);
+int axp221_set_dldo4(unsigned int mvolt);
+int axp221_set_aldo1(unsigned int mvolt);
+int axp221_set_aldo2(unsigned int mvolt);
+int axp221_set_aldo3(unsigned int mvolt);
+int axp221_init(void);