Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 5c4ac1c..6eecdef 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -43,6 +43,14 @@ config ARCH_BCM2835
          This enables support for the Broadcom BCM2837 and BCM2711 SoC.
          These SoCs are used in the Raspberry Pi 3 and 4 devices.
 
+config ARCH_BCM4908
+       bool "Broadcom BCM4908 family"
+       select GPIOLIB
+       help
+         This enables support for the Broadcom BCM4906, BCM4908 and
+         BCM49408 SoCs. These SoCs use Brahma-B53 cores and can be
+         found in home routers.
+
 config ARCH_BCM_IPROC
        bool "Broadcom iProc SoC Family"
        select COMMON_CLK_IPROC
@@ -152,11 +160,6 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
        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
@@ -257,7 +260,6 @@ config ARCH_TEGRA
        select ARM_GIC_PM
        select CLKSRC_MMIO
        select TIMER_OF
-       select GENERIC_CLOCKEVENTS
        select GPIOLIB
        select PINCTRL
        select PM