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

Commit 945b7691 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 975201ca ca0a05a9

arch/arm/mach-mvebu/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ config MACH_ARMADA_38X 
	select ARM_ERRATA_720789

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select ARM_ERRATA_753970

	select ARM_GIC

	select ARM_GIC

	select ARM_GLOBAL_TIMER

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

	select ARMADA_370_XP_IRQ

	select ARMADA_370_XP_IRQ

	select ARMADA_38X_CLK

	select ARMADA_38X_CLK

	select HAVE_ARM_SCU

	select HAVE_ARM_SCU