summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/omap4_panda_defconfig1
-rw-r--r--configs/omap4_sdp4430_defconfig1
-rw-r--r--configs/seaboard_defconfig1
-rw-r--r--drivers/power/Kconfig7
-rw-r--r--include/configs/seaboard.h1
-rw-r--r--include/configs/ti_omap4_common.h3
6 files changed, 10 insertions, 4 deletions
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index 0cae1c6150..79807f104f 100644
--- 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 e15c6d5cb1..e2f1bc67df 100644
--- 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 686a3c062b..2375040a9e 100644
--- 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 5dbcde333b..7f3b990d23 100644
--- 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 4887747968..73b738bd09 100644
--- 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 9a068e2614..64ec59d78e 100644
--- 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
*/