summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2021-06-12 08:54:01 -0700
committerOlof Johansson <olof@lixom.net>2021-06-12 08:54:03 -0700
commit2f80e8b45cda3d3bbeb2563525f676f8b1bbf0f0 (patch)
tree87324bf8b7e24c29134c175325dddb26c431bb56
parent05a3a767667ef5bfa9ac99b76b57be504f01a7a9 (diff)
parentcbccad664927e98db0f12adb7434fdfe51d3073a (diff)
Merge tag 'sunxi-core-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/soc
One patch to select one of our timer in the arm64 Kconfig option. * tag 'sunxi-core-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: sunxi: Build the sun4i timer driver Link: https://lore.kernel.org/r/bf3431f6-2196-425c-9b43-0bf4de0b6d30.lettre@localhost Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/Kconfig.platforms1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 6409b47b73e4..e67e7f5eb166 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -16,6 +16,7 @@ config ARCH_SUNXI
select IRQ_FASTEOI_HIERARCHY_HANDLERS
select PINCTRL
select RESET_CONTROLLER
+ select SUN4I_TIMER
help
This enables support for Allwinner sunxi based SoCs like the A64.