ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP

CLKDEV_LOOKUP selects HAVE_CLK and COMMON_CLK selects CLKDEV_LOOKUP. So
all symbols that select at least two of these symbols can be simplified.

For imx, omap2 and ux500 some rearrangements were necessary before the
simplification.

Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 12 insertions, 17 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 99a28d628297..c67f8ad5ccd5 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -1,37 +1,32 @@
 config ARCH_U8500
         bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
         depends on MMU
+        select AB8500_CORE
+        select ABX500_CORE
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
-        select CLKDEV_LOOKUP
+        select ARM_ERRATA_754322
+        select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
+        select CACHE_L2X0
+        select CLKSRC_NOMADIK_MTU
+        select COMMON_CLK
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
+        select PINCTRL
+        select PINCTRL_ABX500
+        select PINCTRL_NOMADIK
+        select PL310_ERRATA_753970 if CACHE_PL310
         help
           Support for ST-Ericsson's Ux500 architecture
 
 if ARCH_U8500
 
-config UX500_SOC_COMMON
-        bool
-        default y
-        select ABX500_CORE
-        select AB8500_CORE
-        select ARM_ERRATA_754322
-        select ARM_ERRATA_764369 if SMP
-        select ARM_GIC
-        select CACHE_L2X0
-        select CLKSRC_NOMADIK_MTU
-        select COMMON_CLK
-        select PINCTRL
-        select PINCTRL_NOMADIK
-        select PINCTRL_ABX500
-        select PL310_ERRATA_753970 if CACHE_PL310
-
 config UX500_SOC_DB8500
         bool
         select CPU_FREQ_TABLE if CPU_FREQ