diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-12-20 14:09:17 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-02 13:21:20 -0500 |
commit | 17d0900c95622c0bb672bbd7115ae228cfc3cd21 (patch) | |
tree | 6532ccb3b0ce43259b7f415436aad601f4cd536a | |
parent | 2aec37c659500b1ab39355adc17029d0acca7bcb (diff) |
ARM: msm: Simplify ARCH_MSM_DT config
This doesn't need to be a def_bool y. Instead we can have every
DT supported platform select ARCH_MSM_DT and we achieve the same
thing with less chance of conflicts.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 5e5782d5af3d..702553b96137 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -44,6 +44,7 @@ endchoice | |||
44 | 44 | ||
45 | config ARCH_MSM8X60 | 45 | config ARCH_MSM8X60 |
46 | bool "MSM8X60" | 46 | bool "MSM8X60" |
47 | select ARCH_MSM_DT | ||
47 | select ARM_GIC | 48 | select ARM_GIC |
48 | select CPU_V7 | 49 | select CPU_V7 |
49 | select GPIO_MSM_V2 | 50 | select GPIO_MSM_V2 |
@@ -52,6 +53,7 @@ config ARCH_MSM8X60 | |||
52 | 53 | ||
53 | config ARCH_MSM8960 | 54 | config ARCH_MSM8960 |
54 | bool "MSM8960" | 55 | bool "MSM8960" |
56 | select ARCH_MSM_DT | ||
55 | select ARM_GIC | 57 | select ARM_GIC |
56 | select CPU_V7 | 58 | select CPU_V7 |
57 | select HAVE_SMP | 59 | select HAVE_SMP |
@@ -60,6 +62,7 @@ config ARCH_MSM8960 | |||
60 | 62 | ||
61 | config ARCH_MSM8974 | 63 | config ARCH_MSM8974 |
62 | bool "MSM8974" | 64 | bool "MSM8974" |
65 | select ARCH_MSM_DT | ||
63 | select ARM_GIC | 66 | select ARM_GIC |
64 | select CPU_V7 | 67 | select CPU_V7 |
65 | select HAVE_ARM_ARCH_TIMER | 68 | select HAVE_ARM_ARCH_TIMER |
@@ -68,8 +71,7 @@ config ARCH_MSM8974 | |||
68 | select USE_OF | 71 | select USE_OF |
69 | 72 | ||
70 | config ARCH_MSM_DT | 73 | config ARCH_MSM_DT |
71 | def_bool y | 74 | bool |
72 | depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) | ||
73 | select SPARSE_IRQ | 75 | select SPARSE_IRQ |
74 | select USE_OF | 76 | select USE_OF |
75 | 77 | ||