diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-10-01 05:08:56 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-10-07 13:41:32 -0400 |
commit | 07d8a49c263c89c21d1e10b5550706ed8a58eb5e (patch) | |
tree | 4327c646b2f1ebc4f27c7786913040d698842100 /arch/arm/mach-omap2/Kconfig | |
parent | c884357ec6e27c7967c78fb111cc8a830881f43b (diff) |
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>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b5fb5f7992df..c94624429680 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -8,7 +8,6 @@ config ARCH_OMAP2 | |||
8 | select CPU_V6 | 8 | select CPU_V6 |
9 | select MULTI_IRQ_HANDLER | 9 | select MULTI_IRQ_HANDLER |
10 | select SOC_HAS_OMAP2_SDRC | 10 | select SOC_HAS_OMAP2_SDRC |
11 | select COMMON_CLK | ||
12 | 11 | ||
13 | config ARCH_OMAP3 | 12 | config ARCH_OMAP3 |
14 | bool "TI OMAP3" | 13 | bool "TI OMAP3" |
@@ -22,7 +21,6 @@ config ARCH_OMAP3 | |||
22 | select PM_OPP if PM | 21 | select PM_OPP if PM |
23 | select PM_RUNTIME if CPU_IDLE | 22 | select PM_RUNTIME if CPU_IDLE |
24 | select SOC_HAS_OMAP2_SDRC | 23 | select SOC_HAS_OMAP2_SDRC |
25 | select COMMON_CLK | ||
26 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 24 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
27 | 25 | ||
28 | config ARCH_OMAP4 | 26 | config ARCH_OMAP4 |
@@ -45,7 +43,6 @@ config ARCH_OMAP4 | |||
45 | select PM_OPP if PM | 43 | select PM_OPP if PM |
46 | select PM_RUNTIME if CPU_IDLE | 44 | select PM_RUNTIME if CPU_IDLE |
47 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 45 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
48 | select COMMON_CLK | ||
49 | select ARM_ERRATA_754322 | 46 | select ARM_ERRATA_754322 |
50 | select ARM_ERRATA_775420 | 47 | select ARM_ERRATA_775420 |
51 | 48 | ||
@@ -59,7 +56,6 @@ config SOC_OMAP5 | |||
59 | select HAVE_ARM_SCU if SMP | 56 | select HAVE_ARM_SCU if SMP |
60 | select HAVE_ARM_TWD if LOCAL_TIMERS | 57 | select HAVE_ARM_TWD if LOCAL_TIMERS |
61 | select HAVE_SMP | 58 | select HAVE_SMP |
62 | select COMMON_CLK | ||
63 | select HAVE_ARM_ARCH_TIMER | 59 | select HAVE_ARM_ARCH_TIMER |
64 | select ARM_ERRATA_798181 if SMP | 60 | select ARM_ERRATA_798181 if SMP |
65 | 61 | ||
@@ -70,7 +66,6 @@ config SOC_AM33XX | |||
70 | select ARM_CPU_SUSPEND if PM | 66 | select ARM_CPU_SUSPEND if PM |
71 | select CPU_V7 | 67 | select CPU_V7 |
72 | select MULTI_IRQ_HANDLER | 68 | select MULTI_IRQ_HANDLER |
73 | select COMMON_CLK | ||
74 | 69 | ||
75 | config SOC_AM43XX | 70 | config SOC_AM43XX |
76 | bool "TI AM43x" | 71 | bool "TI AM43x" |
@@ -79,7 +74,6 @@ config SOC_AM43XX | |||
79 | select ARCH_OMAP2PLUS | 74 | select ARCH_OMAP2PLUS |
80 | select MULTI_IRQ_HANDLER | 75 | select MULTI_IRQ_HANDLER |
81 | select ARM_GIC | 76 | select ARM_GIC |
82 | select COMMON_CLK | ||
83 | select MACH_OMAP_GENERIC | 77 | select MACH_OMAP_GENERIC |
84 | 78 | ||
85 | config ARCH_OMAP2PLUS | 79 | config ARCH_OMAP2PLUS |
@@ -89,11 +83,10 @@ config ARCH_OMAP2PLUS | |||
89 | select ARCH_HAS_HOLES_MEMORYMODEL | 83 | select ARCH_HAS_HOLES_MEMORYMODEL |
90 | select ARCH_OMAP | 84 | select ARCH_OMAP |
91 | select ARCH_REQUIRE_GPIOLIB | 85 | select ARCH_REQUIRE_GPIOLIB |
92 | select CLKDEV_LOOKUP | ||
93 | select CLKSRC_MMIO | 86 | select CLKSRC_MMIO |
87 | select COMMON_CLK | ||
94 | select GENERIC_CLOCKEVENTS | 88 | select GENERIC_CLOCKEVENTS |
95 | select GENERIC_IRQ_CHIP | 89 | select GENERIC_IRQ_CHIP |
96 | select HAVE_CLK | ||
97 | select OMAP_DM_TIMER | 90 | select OMAP_DM_TIMER |
98 | select PINCTRL | 91 | select PINCTRL |
99 | select PROC_DEVICETREE if PROC_FS | 92 | select PROC_DEVICETREE if PROC_FS |