Merge tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[platform/kernel/linux-rpi.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7efa42e..6409b47 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -8,16 +8,6 @@ config ARCH_ACTIONS
        help
          This enables support for the Actions Semiconductor S900 SoC family.
 
-config ARCH_AGILEX
-       bool "Intel's Agilex SoCFPGA Family"
-       help
-         This enables support for Intel's Agilex SoCFPGA Family.
-
-config ARCH_N5X
-       bool "Intel's eASIC N5X SoCFPGA Family"
-       help
-         This enables support for Intel's eASIC N5X SoCFPGA Family.
-
 config ARCH_SUNXI
        bool "Allwinner sunxi 64-bit SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
@@ -36,6 +26,13 @@ config ARCH_ALPINE
          This enables support for the Annapurna Labs Alpine
          Soc family.
 
+config ARCH_APPLE
+       bool "Apple Silicon SoC family"
+       select APPLE_AIC
+       help
+         This enables support for Apple's in-house ARM SoC family, starting
+         with the Apple M1.
+
 config ARCH_BCM2835
        bool "Broadcom BCM2835 family"
        select TIMER_OF
@@ -252,10 +249,11 @@ config ARCH_SEATTLE
        help
          This enables support for AMD Seattle SOC Family
 
-config ARCH_STRATIX10
-       bool "Altera's Stratix 10 SoCFPGA Family"
+config ARCH_INTEL_SOCFPGA
+       bool "Intel's SoCFPGA ARMv8 Families"
        help
-         This enables support for Altera's Stratix 10 SoCFPGA Family.
+         This enables support for Intel's SoCFPGA ARMv8 families:
+         Stratix 10 (ex. Altera), Agilex and eASIC N5X.
 
 config ARCH_SYNQUACER
        bool "Socionext SynQuacer SoC Family"