aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/Kconfig.platforms
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 17:42:31 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 20:38:15 +0100
commitcfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb (patch)
tree9844d395e57056d69c7ff4c3ac418958b2540955 /arch/arm64/Kconfig.platforms
parentb8961b1eb7d2d6a28b9a51294b0b18aaa5f10d52 (diff)
parentb3077ffcfa24b05c05af3b990d97a392ef88b22e (diff)
downloadkernel-cfe9930e9468e6fe871bca9a7db5c9e2ee10f6bb.tar.gz
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes
Amlogic SoC Kconfig updates for v5.1: - arm64: meson: enable g12a clock controller - drop unneeded COMMON_CLK_AMLOGIC * tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: meson: enable g12a clock controller ARM: meson: remove COMMON_CLK_AMLOGIC selection arm64: meson: remove COMMON_CLK_AMLOGIC selection Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r--arch/arm64/Kconfig.platforms5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 8c2fc4bb20a5..a231815f549b 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -112,12 +112,13 @@ config ARCH_MESON
bool "Amlogic Platforms"
select PINCTRL
select PINCTRL_MESON
- select COMMON_CLK_AMLOGIC
select COMMON_CLK_GXBB
select COMMON_CLK_AXG
+ select COMMON_CLK_G12A
select MESON_IRQ_GPIO
help
- This enables support for the Amlogic S905 SoCs.
+ This enables support for the arm64 based Amlogic SoCs
+ such as the s905, S905X/D, S912, A113X/D or S905X/D2
config ARCH_MVEBU
bool "Marvell EBU SoC Family"