Convert CONFIG_TPS6586X_POWER et al to Kconfig

This converts the following to Kconfig:
   CONFIG_TPS6586X_POWER
   CONFIG_TWL6030_POWER

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index 0cae1c61508e31d3f24326119a095abb2d043eca..79807f104f550a10fad36f82028a0825d37e640e 100644 (file)
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -45,6 +45,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y

diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index e15c6d5cb13a4166a4e553f7077921b791dc94ce..e2f1bc67df50df36f8a99145cf555e67ab3d787e 100644 (file)
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -42,6 +42,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 686a3c062b1d815c3e5f2a80ee0038cee206d579..2375040a9ec55bfbb9c399ce3ac6bbee3bad17ee 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_TPS6586X_POWER=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 5dbcde333ba5fa217c3d5308f9a6f3cad7e8a647..7f3b990d2315d6ccb0a481d870a69765d230895f 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -411,6 +411,9 @@ config SY8106A_VOUT1_VOLT
        is typically used to power the VDD-CPU and should be 1200mV.
        Values can range from 680mV till 1950mV.
 
+config TPS6586X_POWER
+       bool "Enable legacy driver for TI TPS6586x power management chip"
+
 config TWL4030_POWER
        depends on OMAP34XX
        bool "Enable driver for TI TWL4030 power management chip"
@@ -419,6 +422,10 @@ config TWL4030_POWER
        The TWL4030 in a combination audio CODEC/power management with
        GPIO and it is commonly used with the OMAP3 family of processors
 
+config TWL6030_POWER
+       depends on OMAP44XX
+       bool "Enable driver for TI TWL6030 power management chip"
+
 config POWER_MT6323
        bool "Poweroff driver for mediatek mt6323"
        select CMD_POWEROFF

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 4887747968f205acdc2b6f36bb5d8953c911b275..73b738bd0993ee39aeee76b58e69360fad915164 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -12,7 +12,6 @@
 /* LP0 suspend / resume */
 #define CONFIG_TEGRA_LP0
 #define CONFIG_TEGRA_PMU
-#define CONFIG_TPS6586X_POWER
 #define CONFIG_TEGRA_CLOCK_SCALING
 
 #include "tegra20-common.h"

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 9a068e26140256a388eefa4bef93c906904f9d04..64ec59d78eb642331e95220547bfa5a545d56104 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -32,9 +32,6 @@
 #define CFG_SYS_NS16550_COM3           UART3_BASE
 #endif
 
-/* TWL6030 */
-#define CONFIG_TWL6030_POWER           1
-
 /*
  * Environment setup
  */