aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-15 16:36:22 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-19 12:58:30 -0400
commit0deac0bf66110fe70507c5dcec661c9e85fa07ca (patch)
tree2c569c88bbc478003d786604d92f80af7a9c818c /arch
parent39710479303fd3affb3e204e9a7a75cc676977b5 (diff)
ARM: Arrange for COMMON_CLKDEV to select HAVE_CLK
If support for COMMON_CLKDEV is enabled, we have CLK support. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig14
-rw-r--r--arch/arm/common/Kconfig1
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5408bf1bf43..bcaa8c83e522 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -238,7 +238,6 @@ config ARCH_INTEGRATOR
238 bool "ARM Ltd. Integrator family" 238 bool "ARM Ltd. Integrator family"
239 select ARM_AMBA 239 select ARM_AMBA
240 select ARCH_HAS_CPUFREQ 240 select ARCH_HAS_CPUFREQ
241 select HAVE_CLK
242 select COMMON_CLKDEV 241 select COMMON_CLKDEV
243 select ICST525 242 select ICST525
244 help 243 help
@@ -247,7 +246,6 @@ config ARCH_INTEGRATOR
247config ARCH_REALVIEW 246config ARCH_REALVIEW
248 bool "ARM Ltd. RealView family" 247 bool "ARM Ltd. RealView family"
249 select ARM_AMBA 248 select ARM_AMBA
250 select HAVE_CLK
251 select COMMON_CLKDEV 249 select COMMON_CLKDEV
252 select ICST307 250 select ICST307
253 select GENERIC_TIME 251 select GENERIC_TIME
@@ -260,7 +258,6 @@ config ARCH_VERSATILE
260 bool "ARM Ltd. Versatile family" 258 bool "ARM Ltd. Versatile family"
261 select ARM_AMBA 259 select ARM_AMBA
262 select ARM_VIC 260 select ARM_VIC
263 select HAVE_CLK
264 select COMMON_CLKDEV 261 select COMMON_CLKDEV
265 select ICST307 262 select ICST307
266 select GENERIC_TIME 263 select GENERIC_TIME
@@ -321,7 +318,6 @@ config ARCH_EP93XX
321 select ARM_AMBA 318 select ARM_AMBA
322 select ARM_VIC 319 select ARM_VIC
323 select GENERIC_GPIO 320 select GENERIC_GPIO
324 select HAVE_CLK
325 select COMMON_CLKDEV 321 select COMMON_CLKDEV
326 select ARCH_REQUIRE_GPIOLIB 322 select ARCH_REQUIRE_GPIOLIB
327 select ARCH_HAS_HOLES_MEMORYMODEL 323 select ARCH_HAS_HOLES_MEMORYMODEL
@@ -341,7 +337,6 @@ config ARCH_MXC
341 select GENERIC_TIME 337 select GENERIC_TIME
342 select GENERIC_CLOCKEVENTS 338 select GENERIC_CLOCKEVENTS
343 select ARCH_REQUIRE_GPIOLIB 339 select ARCH_REQUIRE_GPIOLIB
344 select HAVE_CLK
345 select COMMON_CLKDEV 340 select COMMON_CLKDEV
346 help 341 help
347 Support for Freescale MXC/iMX-based family of processors 342 Support for Freescale MXC/iMX-based family of processors
@@ -349,7 +344,6 @@ config ARCH_MXC
349config ARCH_STMP3XXX 344config ARCH_STMP3XXX
350 bool "Freescale STMP3xxx" 345 bool "Freescale STMP3xxx"
351 select CPU_ARM926T 346 select CPU_ARM926T
352 select HAVE_CLK
353 select COMMON_CLKDEV 347 select COMMON_CLKDEV
354 select ARCH_REQUIRE_GPIOLIB 348 select ARCH_REQUIRE_GPIOLIB
355 select GENERIC_TIME 349 select GENERIC_TIME
@@ -516,7 +510,6 @@ config ARCH_MMP
516 depends on MMU 510 depends on MMU
517 select GENERIC_GPIO 511 select GENERIC_GPIO
518 select ARCH_REQUIRE_GPIOLIB 512 select ARCH_REQUIRE_GPIOLIB
519 select HAVE_CLK
520 select COMMON_CLKDEV 513 select COMMON_CLKDEV
521 select GENERIC_TIME 514 select GENERIC_TIME
522 select GENERIC_CLOCKEVENTS 515 select GENERIC_CLOCKEVENTS
@@ -552,7 +545,6 @@ config ARCH_W90X900
552 select CPU_ARM926T 545 select CPU_ARM926T
553 select ARCH_REQUIRE_GPIOLIB 546 select ARCH_REQUIRE_GPIOLIB
554 select GENERIC_GPIO 547 select GENERIC_GPIO
555 select HAVE_CLK
556 select COMMON_CLKDEV 548 select COMMON_CLKDEV
557 select GENERIC_TIME 549 select GENERIC_TIME
558 select GENERIC_CLOCKEVENTS 550 select GENERIC_CLOCKEVENTS
@@ -568,7 +560,6 @@ config ARCH_W90X900
568config ARCH_NUC93X 560config ARCH_NUC93X
569 bool "Nuvoton NUC93X CPU" 561 bool "Nuvoton NUC93X CPU"
570 select CPU_ARM926T 562 select CPU_ARM926T
571 select HAVE_CLK
572 select COMMON_CLKDEV 563 select COMMON_CLKDEV
573 help 564 help
574 Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a 565 Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
@@ -577,7 +568,6 @@ config ARCH_NUC93X
577config ARCH_PNX4008 568config ARCH_PNX4008
578 bool "Philips Nexperia PNX4008 Mobile" 569 bool "Philips Nexperia PNX4008 Mobile"
579 select CPU_ARM926T 570 select CPU_ARM926T
580 select HAVE_CLK
581 select COMMON_CLKDEV 571 select COMMON_CLKDEV
582 help 572 help
583 This enables support for Philips PNX4008 mobile platform. 573 This enables support for Philips PNX4008 mobile platform.
@@ -588,7 +578,6 @@ config ARCH_PXA
588 select ARCH_MTD_XIP 578 select ARCH_MTD_XIP
589 select ARCH_HAS_CPUFREQ 579 select ARCH_HAS_CPUFREQ
590 select GENERIC_GPIO 580 select GENERIC_GPIO
591 select HAVE_CLK
592 select COMMON_CLKDEV 581 select COMMON_CLKDEV
593 select ARCH_REQUIRE_GPIOLIB 582 select ARCH_REQUIRE_GPIOLIB
594 select GENERIC_TIME 583 select GENERIC_TIME
@@ -743,7 +732,6 @@ config ARCH_U300
743 select ARM_VIC 732 select ARM_VIC
744 select GENERIC_TIME 733 select GENERIC_TIME
745 select GENERIC_CLOCKEVENTS 734 select GENERIC_CLOCKEVENTS
746 select HAVE_CLK
747 select COMMON_CLKDEV 735 select COMMON_CLKDEV
748 select GENERIC_GPIO 736 select GENERIC_GPIO
749 help 737 help
@@ -764,7 +752,6 @@ config ARCH_NOMADIK
764 select ARM_AMBA 752 select ARM_AMBA
765 select ARM_VIC 753 select ARM_VIC
766 select CPU_ARM926T 754 select CPU_ARM926T
767 select HAVE_CLK
768 select COMMON_CLKDEV 755 select COMMON_CLKDEV
769 select GENERIC_TIME 756 select GENERIC_TIME
770 select GENERIC_CLOCKEVENTS 757 select GENERIC_CLOCKEVENTS
@@ -780,7 +767,6 @@ config ARCH_DAVINCI
780 select GENERIC_CLOCKEVENTS 767 select GENERIC_CLOCKEVENTS
781 select GENERIC_GPIO 768 select GENERIC_GPIO
782 select ARCH_REQUIRE_GPIOLIB 769 select ARCH_REQUIRE_GPIOLIB
783 select HAVE_CLK
784 select ZONE_DMA 770 select ZONE_DMA
785 select HAVE_IDE 771 select HAVE_IDE
786 select COMMON_CLKDEV 772 select COMMON_CLKDEV
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 4efbb9df0444..b64bb78d784c 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -40,3 +40,4 @@ config SHARP_SCOOP
40 40
41config COMMON_CLKDEV 41config COMMON_CLKDEV
42 bool 42 bool
43 select HAVE_CLK