summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-16 23:40:18 +0300
committerArnd Bergmann <arnd@arndb.de>2017-08-16 23:40:18 +0300
commit945b7691a27518619a9ce222eb30e28594e773af (patch)
tree6297c6cb29528d468e183a6038eebf6a2206a745 /arch/arm/mach-mvebu
parent975201caf824af59445e0eeb6d44ae2937c7cfa5 (diff)
parentca0a05a98f3090a77b678eaa778a30febc5795b8 (diff)
downloadlinux-945b7691a27518619a9ce222eb30e28594e773af.tar.xz
Merge tag 'mvebu-soc-4.14-1' of git://git.infradead.org/linux-mvebu into next/soc
Pull "mvebu soc for 4.14 (part 1)" from Gregory CLEMENT: Enabling ARM_GLOBAL_TIMER in mvebu_v7_defconfig for Armada 38x * tag 'mvebu-soc-4.14-1' of git://git.infradead.org/linux-mvebu: ARM: mvebu: enable ARM_GLOBAL_TIMER compilation Armada 38x platforms
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 541647f57192..9b49867154bf 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -60,6 +60,8 @@ config MACH_ARMADA_38X
select ARM_ERRATA_720789
select ARM_ERRATA_753970
select ARM_GIC
+ select ARM_GLOBAL_TIMER
+ select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
select ARMADA_370_XP_IRQ
select ARMADA_38X_CLK
select HAVE_ARM_SCU