Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

arm64: Kconfig.platform: amlogic updates for v5.11
- ship only the necessary clock controllers

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: meson: ship only the necessary clock controllers

Link: https://lore.kernel.org/r/7hlfehjgv8.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm64/Kconfig.platforms
index 5c4ac1c,329e22c..a75513b
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -54,7 -54,6 +54,7 @@@ config ARCH_BCM_IPRO
  config ARCH_BERLIN
        bool "Marvell Berlin SoC Family"
        select DW_APB_ICTL
 +      select DW_APB_TIMER_OF
        select GPIOLIB
        select PINCTRL
        help
@@@ -154,9 -153,6 +154,6 @@@ config ARCH_MESO
        bool "Amlogic Platforms"
        select PINCTRL
        select PINCTRL_MESON
-       select COMMON_CLK_GXBB
-       select COMMON_CLK_AXG
-       select COMMON_CLK_G12A
        select MESON_IRQ_GPIO
        help
          This enables support for the arm64 based Amlogic SoCs