mtd: nand: mxs_nand_spl: refactor mxs_flash_ident

[u-boot] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 3c4416780591e6cc1a47a595b49d52e709eb3684..1a3852442a8b2f3d61dc3326731c6ad66fb880ad 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -1,5 +1,7 @@
 menu "Power"
 
+source "drivers/power/domain/Kconfig"
+
 source "drivers/power/pmic/Kconfig"
 
 source "drivers/power/regulator/Kconfig"
@@ -8,57 +10,62 @@ choice
        prompt "Select Sunxi PMIC Variant"
        depends on ARCH_SUNXI
        default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
-       default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33
+       default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40
        default AXP818_POWER if MACH_SUN8I_A83T
-       default SUNXI_NO_PMIC if MACH_SUN8I_H3 || MACH_SUN50I
+       default SUNXI_NO_PMIC if MACH_SUNXI_H3_H5 || MACH_SUN50I
 
 config SUNXI_NO_PMIC
-       boolean "board without a pmic"
+       bool "board without a pmic"
        ---help---
        Select this for boards which do not use a PMIC.
 
 config AXP152_POWER
-       boolean "axp152 pmic support"
+       bool "axp152 pmic support"
        depends on MACH_SUN5I
+       select AXP_PMIC_BUS
        select CMD_POWEROFF
        ---help---
        Select this to enable support for the axp152 pmic found on most
        A10s boards.
 
 config AXP209_POWER
-       boolean "axp209 pmic support"
+       bool "axp209 pmic support"
        depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
+       select AXP_PMIC_BUS
        select CMD_POWEROFF
        ---help---
        Select this to enable support for the axp209 pmic found on most
        A10, A13 and A20 boards.
 
 config AXP221_POWER
-       boolean "axp221 / axp223 pmic support"
-       depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33
+       bool "axp221 / axp223 pmic support"
+       depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40
+       select AXP_PMIC_BUS
        select CMD_POWEROFF
        ---help---
        Select this to enable support for the axp221/axp223 pmic found on most
        A23 and A31 boards.
 
 config AXP809_POWER
-       boolean "axp809 pmic support"
+       bool "axp809 pmic support"
        depends on MACH_SUN9I
+       select AXP_PMIC_BUS
        select CMD_POWEROFF
        ---help---
        Say y here to enable support for the axp809 pmic found on A80 boards.
 
 config AXP818_POWER
-       boolean "axp818 pmic support"
+       bool "axp818 pmic support"
        depends on MACH_SUN8I_A83T
+       select AXP_PMIC_BUS
        select CMD_POWEROFF
        ---help---
        Say y here to enable support for the axp818 pmic found on
        A83T dev board.
 
 config SY8106A_POWER
-       boolean "SY8106A pmic support"
-       depends on MACH_SUN8I_H3
+       bool "SY8106A pmic support"
+       depends on MACH_SUNXI_H3_H5
        ---help---
        Select this to enable support for the SY8106A pmic found on some
        H3 boards.
@@ -68,7 +75,7 @@ endchoice
 config AXP_DCDC1_VOLT
        int "axp pmic dcdc1 voltage"
        depends on AXP221_POWER || AXP809_POWER || AXP818_POWER
-       default 3300 if AXP818_POWER
+       default 3300 if AXP818_POWER || MACH_SUN8I_R40
        default 3000 if MACH_SUN6I || MACH_SUN8I || MACH_SUN9I
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc1 at, set to 0 to
@@ -95,6 +102,7 @@ config AXP_DCDC2_VOLT
        On A23/A33 boards dcdc2 is used for VDD-SYS and should be 1.1V.
        On A80 boards dcdc2 powers the GPU and can be left off.
        On A83T boards dcdc2 is used for VDD-CPUA(cluster 0) and should be 0.9V.
+       On R40 boards dcdc2 is VDD-CPU and should be 1.1V
 
 config AXP_DCDC3_VOLT
        int "axp pmic dcdc3 voltage"
@@ -102,6 +110,7 @@ config AXP_DCDC3_VOLT
        default 900 if AXP809_POWER || AXP818_POWER
        default 1500 if AXP152_POWER
        default 1250 if AXP209_POWER
+       default 1100 if MACH_SUN8I_R40
        default 1200 if MACH_SUN6I || MACH_SUN8I
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc3 at, set to 0 to
@@ -112,6 +121,7 @@ config AXP_DCDC3_VOLT
        On A23 / A31 / A33 boards dcdc3 is VDD-CPU and should be 1.2V.
        On A80 boards dcdc3 is used for VDD-CPUA(cluster 0) and should be 0.9V.
        On A83T boards dcdc3 is used for VDD-CPUB(cluster 1) and should be 0.9V.
+       On R40 boards dcdc3 is VDD-SYS and VDD-GPU and should be 1.1V.
 
 config AXP_DCDC4_VOLT
        int "axp pmic dcdc4 voltage"
@@ -136,13 +146,13 @@ config AXP_DCDC5_VOLT
        ---help---
        Set the voltage (mV) to program the axp pmic dcdc5 at, set to 0 to
        disable dcdc5.
-       On A23 / A31 / A33 / A80 / A83T boards dcdc5 is VCC-DRAM and
+       On A23 / A31 / A33 / A80 / A83T / R40 boards dcdc5 is VCC-DRAM and
        should be 1.5V, 1.35V if DDR3L is used.
 
 config AXP_ALDO1_VOLT
        int "axp pmic (a)ldo1 voltage"
        depends on AXP221_POWER || AXP809_POWER || AXP818_POWER
-       default 0 if MACH_SUN6I
+       default 0 if MACH_SUN6I || MACH_SUN8I_R40
        default 1800 if MACH_SUN8I_A83T
        default 3000 if MACH_SUN8I || MACH_SUN9I
        ---help---
@@ -181,7 +191,8 @@ config AXP_ALDO3_VOLT
        Set the voltage (mV) to program the axp pmic aldo3 at, set to 0 to
        disable aldo3.
        On A10(s) / A13 / A20 boards aldo3 should be 2.8V.
-       On A23 / A31 / A33 boards aldo3 is VCC-PLL and AVCC and should be 3.0V.
+       On A23 / A31 / A33 / R40 boards aldo3 is VCC-PLL and AVCC and should
+       be 3.0V.
        On A80 boards aldo3 is normally not used.
        On A83T / H8 boards aldo3 is AVCC, VCC-PL, and VCC-LED, and should be
        3.0V.
@@ -302,4 +313,12 @@ config SY8106A_VOUT1_VOLT
        is typically used to power the VDD-CPU and should be 1200mV.
        Values can range from 680mV till 1950mV.
 
+config TWL4030_POWER
+       depends on OMAP34XX
+       bool "Enable driver for TI TWL4030 power management chip"
+       imply CMD_POWEROFF
+       ---help---
+       The TWL4030 in a combination audio CODEC/power management with
+       GPIO and it is commonly used with the OMAP3 family of processors
+
 endmenu