diff options
author | Rohit Vaswani <rvaswani@codeaurora.org> | 2013-06-10 15:50:19 -0700 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2013-06-12 13:52:51 -0700 |
commit | eda9dcfa56f4864e0e4340f5af3f3e39f514b726 (patch) | |
tree | e7e48f1169aa36fc3eff75135cc8d24b362d3302 /arch/arm/mach-msm/Kconfig | |
parent | 1a56e4b23d2b4445397419202ff40e0b34ba3d7e (diff) | |
download | blackbird-op-linux-eda9dcfa56f4864e0e4340f5af3f3e39f514b726.tar.gz blackbird-op-linux-eda9dcfa56f4864e0e4340f5af3f3e39f514b726.zip |
ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
Remove gpiomux-v2 as it's not being used and make way for future improvements.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index fceb093b9494..614e41e7881b 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -48,9 +48,7 @@ config ARCH_MSM8X60 select CPU_V7 select GPIO_MSM_V2 select HAVE_SMP - select MSM_GPIOMUX select MSM_SCM if SMP - select MSM_V2_TLMM select USE_OF config ARCH_MSM8960 @@ -58,9 +56,8 @@ config ARCH_MSM8960 select ARM_GIC select CPU_V7 select HAVE_SMP - select MSM_GPIOMUX + select GPIO_MSM_V2 select MSM_SCM if SMP - select MSM_V2_TLMM select USE_OF config MSM_HAS_DEBUG_UART_HS @@ -124,10 +121,10 @@ config MSM_SMD bool config MSM_GPIOMUX - bool - -config MSM_V2_TLMM - bool + depends on !(ARCH_MSM8X60 || ARCH_MSM8960) + bool "MSM V1 TLMM GPIOMUX architecture" + help + Support for MSM V1 TLMM GPIOMUX architecture. config MSM_SCM bool |