summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-20 17:20:59 +0100
committerArnd Bergmann <arnd@arndb.de>2014-11-20 17:20:59 +0100
commitf2f456e720351028bdd84f02abb5a58ceacbdcaa (patch)
treedcfe4676dd5490d62e928e37282018957995536a /drivers/clocksource
parent2db0aea590246b570b9352659f065727900c6f69 (diff)
parent7b6b0a455d98c7a314278e0fdca25ec6395a502a (diff)
downloadop-kernel-dev-f2f456e720351028bdd84f02abb5a58ceacbdcaa.zip
op-kernel-dev-f2f456e720351028bdd84f02abb5a58ceacbdcaa.tar.gz
Merge tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Pull "ARM: meson: SOC related changes" from Carlo Caione: This is the pull request for the SoC related changes for the 3.19. The support for Meson8 is added together with L2 cache management. * tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson: clocksource: meson6: Select CLKSRC_MMIO ARM: meson: enable L2 cache ARM: meson: document meson8 compatible properties ARM: meson: add meson8 support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 9042060..f657a48 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -32,6 +32,7 @@ config ARMADA_370_XP_TIMER
config MESON6_TIMER
bool
+ select CLKSRC_MMIO
config ORION_TIMER
select CLKSRC_OF
OpenPOWER on IntegriCloud