diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2013-03-20 09:57:38 -0400 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2013-06-07 05:20:28 -0400 |
| commit | fb521a0da1551468a45f2e2a1c1941d0033357ea (patch) | |
| tree | 9b69236c36526b6e2fb0f4c41f64b6edf65e83e1 | |
| parent | 0d651e4e65e96989f72236bf83bd4c6e55eb6ce4 (diff) | |
arm: fix up ARM_ARCH_TIMER selects
In 8a4da6e: "arm: arch_timer: move core to drivers/clocksource", the
selection of ARM_ARCH_TIMER was indirected via HAVE_ARM_ARCH_TIMER,
though mach-exynos's selection of ARM_ARCH_TIMER was missed, and since
then mach-shmobile, mach-tegra, and mach-virt have begun selecting
ARM_ARCH_TIMER. This can lead to architected timer support erroneously
appearing to not be selected in menuconfig.
This patch fixes up the Kconfigs for those platforms to select
HAVE_ARM_ARCH_TIMER.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-virt/Kconfig | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index d19edff0ea6e..3c3f36a8fbd4 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -76,7 +76,7 @@ config SOC_EXYNOS5440 | |||
| 76 | default y | 76 | default y |
| 77 | depends on ARCH_EXYNOS5 | 77 | depends on ARCH_EXYNOS5 |
| 78 | select ARCH_HAS_OPP | 78 | select ARCH_HAS_OPP |
| 79 | select ARM_ARCH_TIMER | 79 | select HAVE_ARM_ARCH_TIMER |
| 80 | select AUTO_ZRELADDR | 80 | select AUTO_ZRELADDR |
| 81 | select PINCTRL | 81 | select PINCTRL |
| 82 | select PINCTRL_EXYNOS5440 | 82 | select PINCTRL_EXYNOS5440 |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 1a517e2fe449..767a6c3c27a4 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -23,7 +23,7 @@ config ARCH_R8A73A4 | |||
| 23 | select ARCH_WANT_OPTIONAL_GPIOLIB | 23 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 24 | select ARM_GIC | 24 | select ARM_GIC |
| 25 | select CPU_V7 | 25 | select CPU_V7 |
| 26 | select ARM_ARCH_TIMER | 26 | select HAVE_ARM_ARCH_TIMER |
| 27 | select SH_CLK_CPG | 27 | select SH_CLK_CPG |
| 28 | select RENESAS_IRQC | 28 | select RENESAS_IRQC |
| 29 | 29 | ||
| @@ -56,7 +56,7 @@ config ARCH_R8A7790 | |||
| 56 | select ARCH_WANT_OPTIONAL_GPIOLIB | 56 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 57 | select ARM_GIC | 57 | select ARM_GIC |
| 58 | select CPU_V7 | 58 | select CPU_V7 |
| 59 | select ARM_ARCH_TIMER | 59 | select HAVE_ARM_ARCH_TIMER |
| 60 | select SH_CLK_CPG | 60 | select SH_CLK_CPG |
| 61 | select RENESAS_IRQC | 61 | select RENESAS_IRQC |
| 62 | 62 | ||
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 84d72fc36dfe..65c5ae6fa386 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
| @@ -60,7 +60,7 @@ config ARCH_TEGRA_3x_SOC | |||
| 60 | 60 | ||
| 61 | config ARCH_TEGRA_114_SOC | 61 | config ARCH_TEGRA_114_SOC |
| 62 | bool "Enable support for Tegra114 family" | 62 | bool "Enable support for Tegra114 family" |
| 63 | select ARM_ARCH_TIMER | 63 | select HAVE_ARM_ARCH_TIMER |
| 64 | select ARM_GIC | 64 | select ARM_GIC |
| 65 | select ARM_L1_CACHE_SHIFT_6 | 65 | select ARM_L1_CACHE_SHIFT_6 |
| 66 | select CPU_FREQ_TABLE if CPU_FREQ | 66 | select CPU_FREQ_TABLE if CPU_FREQ |
diff --git a/arch/arm/mach-virt/Kconfig b/arch/arm/mach-virt/Kconfig index 8958f0d896bc..081d46929436 100644 --- a/arch/arm/mach-virt/Kconfig +++ b/arch/arm/mach-virt/Kconfig | |||
| @@ -2,7 +2,7 @@ config ARCH_VIRT | |||
| 2 | bool "Dummy Virtual Machine" if ARCH_MULTI_V7 | 2 | bool "Dummy Virtual Machine" if ARCH_MULTI_V7 |
| 3 | select ARCH_WANT_OPTIONAL_GPIOLIB | 3 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 4 | select ARM_GIC | 4 | select ARM_GIC |
| 5 | select ARM_ARCH_TIMER | 5 | select HAVE_ARM_ARCH_TIMER |
| 6 | select ARM_PSCI | 6 | select ARM_PSCI |
| 7 | select HAVE_SMP | 7 | select HAVE_SMP |
| 8 | select CPU_V7 | 8 | select CPU_V7 |