Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb521a0d authored by Mark Rutland's avatar Mark Rutland
Browse files

arm: fix up ARM_ARCH_TIMER selects 



In 8a4da6e3: "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: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
parent 0d651e4e

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ config SOC_EXYNOS5440 
	default y

	default y

	depends on ARCH_EXYNOS5

	depends on ARCH_EXYNOS5

	select ARCH_HAS_OPP

	select ARCH_HAS_OPP

	select ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

	select AUTO_ZRELADDR

	select AUTO_ZRELADDR

	select PINCTRL

	select PINCTRL

	select PINCTRL_EXYNOS5440

	select PINCTRL_EXYNOS5440

arch/arm/mach-shmobile/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ config ARCH_R8A73A4 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select ARM_GIC

	select CPU_V7

	select CPU_V7

	select ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

	select SH_CLK_CPG

	select SH_CLK_CPG

	select RENESAS_IRQC

	select RENESAS_IRQC
@@ -56,7 +56,7 @@ config ARCH_R8A7790 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select ARM_GIC

	select CPU_V7

	select CPU_V7

	select ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

	select SH_CLK_CPG

	select SH_CLK_CPG

	select RENESAS_IRQC

	select RENESAS_IRQC

arch/arm/mach-tegra/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ config ARCH_TEGRA_3x_SOC 




config ARCH_TEGRA_114_SOC

config ARCH_TEGRA_114_SOC

	bool "Enable support for Tegra114 family"

	bool "Enable support for Tegra114 family"

	select ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

	select ARM_GIC

	select ARM_GIC

	select ARM_L1_CACHE_SHIFT_6

	select ARM_L1_CACHE_SHIFT_6

	select CPU_FREQ_TABLE if CPU_FREQ

	select CPU_FREQ_TABLE if CPU_FREQ

arch/arm/mach-virt/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ config ARCH_VIRT 
	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select ARM_GIC

	select ARM_ARCH_TIMER

	select HAVE_ARM_ARCH_TIMER

	select ARM_PSCI

	select ARM_PSCI

	select HAVE_SMP

	select HAVE_SMP

	select CPU_V7

	select CPU_V7