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>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index b16831697183..15e9cb75738e 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -9,7 +9,6 @@ menuconfig ARCH_MESON
         select PINCTRL
         select PINCTRL_MESON
         select COMMON_CLK
-        select COMMON_CLK_AMLOGIC
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
 
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"