Merge tag 'arm-soc-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[thirdparty/kernel/linux.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index bfd344a4737e62214ae82f6c959c942ebf96452a..76580b932e446a130f35b6ebde4b136899ea7b0a 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -33,6 +33,11 @@ config ARCH_APPLE
          This enables support for Apple's in-house ARM SoC family, starting
          with the Apple M1.
 
+menuconfig ARCH_BCM
+       bool "Broadcom SoC Support"
+
+if ARCH_BCM
+
 config ARCH_BCM2835
        bool "Broadcom BCM2835 family"
        select TIMER_OF
@@ -65,6 +70,16 @@ config ARCH_BCMBCA
          This enables support for Broadcom BCA ARM-based broadband chipsets,
          including the DSL, PON and Wireless family of chips.
 
+config ARCH_BRCMSTB
+       bool "Broadcom Set-Top-Box SoCs"
+       select ARCH_HAS_RESET_CONTROLLER
+       select GENERIC_IRQ_CHIP
+       select PINCTRL
+       help
+         This enables support for Broadcom's ARMv8 Set Top Box SoCs
+
+endif
+
 config ARCH_BERLIN
        bool "Marvell Berlin SoC Family"
        select DW_APB_ICTL
@@ -79,14 +94,6 @@ config ARCH_BITMAIN
        help
          This enables support for the Bitmain SoC Family.
 
-config ARCH_BRCMSTB
-       bool "Broadcom Set-Top-Box SoCs"
-       select ARCH_HAS_RESET_CONTROLLER
-       select GENERIC_IRQ_CHIP
-       select PINCTRL
-       help
-         This enables support for Broadcom's ARMv8 Set Top Box SoCs
-
 config ARCH_EXYNOS
        bool "ARMv8 based Samsung Exynos SoC family"
        select COMMON_CLK_SAMSUNG
@@ -128,12 +135,6 @@ config ARCH_K3
          This enables support for Texas Instruments' K3 multicore SoC
          architecture.
 
-config ARCH_LAYERSCAPE
-       bool "ARMv8 based Freescale Layerscape SoC family"
-       select EDAC_SUPPORT
-       help
-         This enables support for the Freescale Layerscape SoC family.
-
 config ARCH_LG1K
        bool "LG Electronics LG1K SoC Family"
        help
@@ -192,6 +193,17 @@ config ARCH_MVEBU
           - Armada 8K SoC Family
           - 98DX2530 SoC Family
 
+menuconfig ARCH_NXP
+       bool "NXP SoC support"
+
+if ARCH_NXP
+
+config ARCH_LAYERSCAPE
+       bool "ARMv8 based Freescale Layerscape SoC family"
+       select EDAC_SUPPORT
+       help
+         This enables support for the Freescale Layerscape SoC family.
+
 config ARCH_MXC
        bool "ARMv8 based NXP i.MX SoC family"
        select ARM64_ERRATUM_843419
@@ -206,6 +218,13 @@ config ARCH_MXC
          This enables support for the ARMv8 based SoCs in the
          NXP i.MX family.
 
+config ARCH_S32
+       bool "NXP S32 SoC Family"
+       help
+         This enables support for the NXP S32 family of processors.
+
+endif
+
 config ARCH_NPCM
        bool "Nuvoton NPCM Architecture"
        select PINCTRL
@@ -235,7 +254,6 @@ config ARCH_RENESAS
        bool "Renesas SoC Platforms"
        select GPIOLIB
        select PINCTRL
-       select SOC_BUS
        help
          This enables support for the ARMv8 based Renesas SoCs.
 
@@ -249,11 +267,6 @@ config ARCH_ROCKCHIP
          This enables support for the ARMv8 based Rockchip chipsets,
          like the RK3368.
 
-config ARCH_S32
-       bool "NXP S32 SoC Family"
-       help
-         This enables support for the NXP S32 family of processors.
-
 config ARCH_SEATTLE
        bool "AMD Seattle SoC Family"
        help