summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-09-13 11:41:20 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2011-09-27 10:59:01 +0200
commit06b497a5ae4ebf03fb14210c3a6dd8bc40257739 (patch)
tree10e93e304d58fd8034e71ac347fc5b1aaf8b4492
parent1ce35f4af6f646f25a5831021db4797f276c5fd6 (diff)
ARM: u8500: Not every u8500 has a TPS6105
Do not always select TPS6105X, but enable it via defconfig Change-Id: Iae2433a2060f2415dfcd30dd7a16338728b91ec2 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31951 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
-rwxr-xr-xarch/arm/configs/u8500_defconfig1
-rw-r--r--arch/arm/mach-ux500/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 2d0117fe7c6..ce5ffe3d8f7 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -206,6 +206,7 @@ CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
+CONFIG_TPS6105X=y
CONFIG_AB5500_CORE=y
CONFIG_AB8500_CORE=y
CONFIG_REGULATOR_DEBUG=y
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index bac92c034d4..29fbc168bae 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -30,7 +30,6 @@ menu "Ux500 target platform (boards)"
config MACH_U8500
bool "U8500 Development platform"
depends on UX500_SOC_DB8500
- select TPS6105X
help
Include support for the mop500 development platform.