diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-08 09:09:47 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 13:04:51 -0400 |
commit | 234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868 (patch) | |
tree | 891f57ca663b5ec0bb61bb3e38c5306e0d13d2bd /arch/arm/Kconfig | |
parent | 442c8176d2efa468577738e3a99a6e051f6e8e55 (diff) |
clocksource: convert ARM 32-bit up counting clocksources
Convert ixp4xx, lpc32xx, mxc, netx, pxa, sa1100, tcc8k, tegra and u300
to use the generic mmio clocksource recently introduced.
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: "Hans J. Koch" <hjk@hansjkoch.de>
Acked-by: Colin Cross <ccross@android.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Olof Johansson <olof@lixom.net>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 377a7a595b08..9aa551497034 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -366,6 +366,7 @@ config ARCH_MXC | |||
366 | select GENERIC_CLOCKEVENTS | 366 | select GENERIC_CLOCKEVENTS |
367 | select ARCH_REQUIRE_GPIOLIB | 367 | select ARCH_REQUIRE_GPIOLIB |
368 | select CLKDEV_LOOKUP | 368 | select CLKDEV_LOOKUP |
369 | select CLKSRC_MMIO | ||
369 | select HAVE_SCHED_CLOCK | 370 | select HAVE_SCHED_CLOCK |
370 | help | 371 | help |
371 | Support for Freescale MXC/iMX-based family of processors | 372 | Support for Freescale MXC/iMX-based family of processors |
@@ -390,6 +391,7 @@ config ARCH_STMP3XXX | |||
390 | 391 | ||
391 | config ARCH_NETX | 392 | config ARCH_NETX |
392 | bool "Hilscher NetX based" | 393 | bool "Hilscher NetX based" |
394 | select CLKSRC_MMIO | ||
393 | select CPU_ARM926T | 395 | select CPU_ARM926T |
394 | select ARM_VIC | 396 | select ARM_VIC |
395 | select GENERIC_CLOCKEVENTS | 397 | select GENERIC_CLOCKEVENTS |
@@ -457,6 +459,7 @@ config ARCH_IXP2000 | |||
457 | config ARCH_IXP4XX | 459 | config ARCH_IXP4XX |
458 | bool "IXP4xx-based" | 460 | bool "IXP4xx-based" |
459 | depends on MMU | 461 | depends on MMU |
462 | select CLKSRC_MMIO | ||
460 | select CPU_XSCALE | 463 | select CPU_XSCALE |
461 | select GENERIC_GPIO | 464 | select GENERIC_GPIO |
462 | select GENERIC_CLOCKEVENTS | 465 | select GENERIC_CLOCKEVENTS |
@@ -497,6 +500,7 @@ config ARCH_LOKI | |||
497 | 500 | ||
498 | config ARCH_LPC32XX | 501 | config ARCH_LPC32XX |
499 | bool "NXP LPC32XX" | 502 | bool "NXP LPC32XX" |
503 | select CLKSRC_MMIO | ||
500 | select CPU_ARM926T | 504 | select CPU_ARM926T |
501 | select ARCH_REQUIRE_GPIOLIB | 505 | select ARCH_REQUIRE_GPIOLIB |
502 | select HAVE_IDE | 506 | select HAVE_IDE |
@@ -592,6 +596,7 @@ config ARCH_NUC93X | |||
592 | config ARCH_TEGRA | 596 | config ARCH_TEGRA |
593 | bool "NVIDIA Tegra" | 597 | bool "NVIDIA Tegra" |
594 | select CLKDEV_LOOKUP | 598 | select CLKDEV_LOOKUP |
599 | select CLKSRC_MMIO | ||
595 | select GENERIC_TIME | 600 | select GENERIC_TIME |
596 | select GENERIC_CLOCKEVENTS | 601 | select GENERIC_CLOCKEVENTS |
597 | select GENERIC_GPIO | 602 | select GENERIC_GPIO |
@@ -617,6 +622,7 @@ config ARCH_PXA | |||
617 | select ARCH_MTD_XIP | 622 | select ARCH_MTD_XIP |
618 | select ARCH_HAS_CPUFREQ | 623 | select ARCH_HAS_CPUFREQ |
619 | select CLKDEV_LOOKUP | 624 | select CLKDEV_LOOKUP |
625 | select CLKSRC_MMIO | ||
620 | select ARCH_REQUIRE_GPIOLIB | 626 | select ARCH_REQUIRE_GPIOLIB |
621 | select GENERIC_CLOCKEVENTS | 627 | select GENERIC_CLOCKEVENTS |
622 | select HAVE_SCHED_CLOCK | 628 | select HAVE_SCHED_CLOCK |
@@ -667,6 +673,7 @@ config ARCH_RPC | |||
667 | 673 | ||
668 | config ARCH_SA1100 | 674 | config ARCH_SA1100 |
669 | bool "SA1100-based" | 675 | bool "SA1100-based" |
676 | select CLKSRC_MMIO | ||
670 | select CPU_SA1100 | 677 | select CPU_SA1100 |
671 | select ISA | 678 | select ISA |
672 | select ARCH_SPARSEMEM_ENABLE | 679 | select ARCH_SPARSEMEM_ENABLE |
@@ -803,6 +810,7 @@ config ARCH_SHARK | |||
803 | 810 | ||
804 | config ARCH_TCC_926 | 811 | config ARCH_TCC_926 |
805 | bool "Telechips TCC ARM926-based systems" | 812 | bool "Telechips TCC ARM926-based systems" |
813 | select CLKSRC_MMIO | ||
806 | select CPU_ARM926T | 814 | select CPU_ARM926T |
807 | select HAVE_CLK | 815 | select HAVE_CLK |
808 | select CLKDEV_LOOKUP | 816 | select CLKDEV_LOOKUP |
@@ -813,6 +821,7 @@ config ARCH_TCC_926 | |||
813 | config ARCH_U300 | 821 | config ARCH_U300 |
814 | bool "ST-Ericsson U300 Series" | 822 | bool "ST-Ericsson U300 Series" |
815 | depends on MMU | 823 | depends on MMU |
824 | select CLKSRC_MMIO | ||
816 | select CPU_ARM926T | 825 | select CPU_ARM926T |
817 | select HAVE_SCHED_CLOCK | 826 | select HAVE_SCHED_CLOCK |
818 | select HAVE_TCM | 827 | select HAVE_TCM |