Merge branch 'master' of git://git.denx.de/u-boot-uniphier

[u-boot] / board / sunxi / board.c

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index b5dfe958ad82b3461944abb9c59db66ef3273d4c..7d6d075f145ee93d4e3463544b7ccd3694ec9771 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -175,26 +175,20 @@ void sunxi_board_init(void)
 #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_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
+       power_failed |= axp221_set_dcdc5(1500); /* VCC-DRAM */
        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:");