| Message ID | 1364404312-4427-5-git-send-email-mark.rutland@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/27/2013 11:11 AM, Mark Rutland wrote: > 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-virt and mach-tegra 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. Acked-by: Stephen Warren <swarren@nvidia.com> I assume you'll take this patch through some tree of yours.
On Wed, Mar 27, 2013 at 07:47:00PM +0000, Stephen Warren wrote: > On 03/27/2013 11:11 AM, Mark Rutland wrote: > > 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-virt and mach-tegra 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. > > Acked-by: Stephen Warren <swarren@nvidia.com> Cheers. > > I assume you'll take this patch through some tree of yours. > Yup, that's the plan. Mark.
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 70f94c8..fd45ec0 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -72,7 +72,7 @@ config SOC_EXYNOS5440 bool "SAMSUNG EXYNOS5440" default y depends on ARCH_EXYNOS5 - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR select PINCTRL select PINCTRL_EXYNOS5440 diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index d1c4893..2a4c9b8 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -45,7 +45,7 @@ config ARCH_TEGRA_3x_SOC config ARCH_TEGRA_114_SOC bool "Enable support for Tegra114 family" - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_GIC select ARM_L1_CACHE_SHIFT_6 select CPU_V7 diff --git a/arch/arm/mach-virt/Kconfig b/arch/arm/mach-virt/Kconfig index 8958f0d..081d469 100644 --- a/arch/arm/mach-virt/Kconfig +++ b/arch/arm/mach-virt/Kconfig @@ -2,7 +2,7 @@ config ARCH_VIRT bool "Dummy Virtual Machine" if ARCH_MULTI_V7 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_PSCI select HAVE_SMP select CPU_V7
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-virt and mach-tegra 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> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mach-tegra/Kconfig | 2 +- arch/arm/mach-virt/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)