summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/sunxi/board.c19
-rw-r--r--drivers/power/axp221.c7
-rw-r--r--include/axp221.h17
3 files changed, 42 insertions, 1 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 2e08a925b9..6364315e56 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -542,6 +542,25 @@ void sunxi_board_init(void)
#endif
#ifdef CONFIG_AXP209_POWER
power_failed |= axp_set_aldo4(CONFIG_AXP_ALDO4_VOLT);
+ power_failed |= axp209_init();
+ power_failed |= axp209_set_dcdc2(1400);
+ power_failed |= axp209_set_dcdc3(1250);
+ 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_write(0x8f,0x41);
+ power_failed |= axp221_write(0x30,0x66);
+ power_failed |= axp221_write(0x30,0x62);
+ power_failed |= axp221_set_dcdc1(CONFIG_AXP221_DCDC1_VOLT);
+ power_failed |= axp221_set_dcdc2(1200); /* A31:VDD-GPU, A23:VDD-SYS */
+ power_failed |= axp221_set_dcdc3(1200); /* VDD-CPU */
+#ifdef CONFIG_MACH_SUN6I
+ power_failed |= axp221_set_dcdc4(1200); /* A31:VDD-SYS */
+#else
+ power_failed |= axp221_set_dcdc4(0); /* A23:unused */
#endif
#if defined(CONFIG_AXP221_POWER) || defined(CONFIG_AXP809_POWER) || \
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 109d3f4686..d40db87470 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -26,7 +26,12 @@ static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
return (mvolt - min) / div;
}
-int axp_set_dcdc1(unsigned int mvolt)
+int axp221_write(u8 reg, u8 val)
+{
+ return pmic_bus_write(reg, val);
+}
+
+int axp221_set_dcdc1(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
diff --git a/include/axp221.h b/include/axp221.h
index b4b64b0e87..a4baa11e12 100644
--- a/include/axp221.h
+++ b/include/axp221.h
@@ -64,3 +64,20 @@
#define AXP_GPIO_CTRL_INPUT 0x02 /* Input */
#define AXP_GPIO_STATE 0x94
#define AXP_GPIO_STATE_OFFSET 0
+
+int axp221_write(u8 reg, u8 val);
+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_set_eldo(int eldo_num, unsigned int mvolt);
+int axp221_init(void);
+int axp221_get_sid(unsigned int *sid);