summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-06-29 17:19:27 +0200
committerArnd Bergmann <arnd@arndb.de>2017-06-29 17:19:27 +0200
commit96f630279ad49402fa394e145a2c28bd97d6e3c4 (patch)
treeacdcbca0e2f098a1dd4bfcbfc593b8e6a7efb841
parenta1f338f8741365fd5f03ec1954e65b06ac26d60b (diff)
parentc88cc3ee1b2045ccff904f1187d62fdc3895a532 (diff)
downloadlinux-stable-96f630279ad49402fa394e145a2c28bd97d6e3c4.tar.gz
linux-stable-96f630279ad49402fa394e145a2c28bd97d6e3c4.tar.bz2
linux-stable-96f630279ad49402fa394e145a2c28bd97d6e3c4.zip
Merge tag 'actions-arm64-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/arm64
Pull "Actions Semi ARM64 SoC for v4.13" from Andreas Färber: This adds a Kconfig symbol for DTs and drivers being added. * tag 'actions-arm64-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions: arm64: Prepare Actions Semi S900
-rw-r--r--arch/arm64/Kconfig.platforms6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7956c9ccd179..319956fa3908 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -1,5 +1,11 @@
menu "Platform selection"
+config ARCH_ACTIONS
+ bool "Actions Semi Platforms"
+ select OWL_TIMER
+ help
+ This enables support for the Actions Semiconductor S900 SoC family.
+
config ARCH_SUNXI
bool "Allwinner sunxi 64-bit SoC Family"
select ARCH_HAS_RESET_CONTROLLER