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

[platform/kernel/u-boot.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index befb845..809f8f1 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -53,13 +53,14 @@ config AXP_DCDC2_VOLT
        int "axp pmic dcdc2 voltage"
        depends on AXP152_POWER || AXP209_POWER || AXP221_POWER
        default 1400 if AXP152_POWER || AXP209_POWER
-       default 1200 if MACH_SUN6I || MACH_SUN8I
+       default 1200 if MACH_SUN6I
+       default 1100 if MACH_SUN8I
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc2 at, set to 0 to
        disable dcdc2.
        On A10(s) / A13 / A20 boards dcdc2 is VDD-CPU and should be 1.4V.
        On A31 boards dcdc2 is used for VDD-GPU and should be 1.2V.
-       On A23/A33 boards dcdc2 is used for VDD-SYS and should be 1.2V.
+       On A23/A33 boards dcdc2 is used for VDD-SYS and should be 1.1V.
 
 config AXP_DCDC3_VOLT
        int "axp pmic dcdc3 voltage"
@@ -100,7 +101,8 @@ config AXP_DCDC5_VOLT
 config AXP_ALDO1_VOLT
        int "axp pmic (a)ldo1 voltage"
        depends on AXP221_POWER
-       default 0
+       default 0 if MACH_SUN6I
+       default 3000 if MACH_SUN8I
        ---help---
        Set the voltage (mV) to program the axp pmic aldo1 at, set to 0 to
        disable aldo1.
@@ -124,7 +126,7 @@ config AXP_ALDO2_VOLT
 config AXP_ALDO3_VOLT
        int "axp pmic (a)ldo3 voltage"
        depends on AXP209_POWER || AXP221_POWER
-       default 2800 if AXP209_POWER
+       default 0 if AXP209_POWER
        default 3000 if MACH_SUN6I || MACH_SUN8I
        ---help---
        Set the voltage (mV) to program the axp pmic aldo3 at, set to 0 to
@@ -135,7 +137,7 @@ config AXP_ALDO3_VOLT
 config AXP_ALDO4_VOLT
        int "axp pmic (a)ldo4 voltage"
        depends on AXP209_POWER
-       default 2800 if AXP209_POWER
+       default 0 if AXP209_POWER
        ---help---
        Set the voltage (mV) to program the axp pmic aldo4 at, set to 0 to
        disable aldo4.