Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

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

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 5a89a95..51bc479 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -3,6 +3,7 @@ menu "Platform selection"
 config ARCH_ACTIONS
        bool "Actions Semi Platforms"
        select OWL_TIMER
+       select PINCTRL
        help
          This enables support for the Actions Semiconductor S900 SoC family.
 
@@ -67,6 +68,7 @@ config ARCH_EXYNOS
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
+       select PM_GENERIC_DOMAINS if PM
        select SOC_SAMSUNG
        help
          This enables support for ARMv8 based Samsung Exynos SoC family.
@@ -153,40 +155,30 @@ config ARCH_REALTEK
          This enables support for the ARMv8 based Realtek chipsets,
          like the RTD1295.
 
-config ARCH_ROCKCHIP
-       bool "Rockchip Platforms"
-       select ARCH_HAS_RESET_CONTROLLER
-       select GPIOLIB
-       select PINCTRL
-       select PINCTRL_ROCKCHIP
-       select PM
-       select ROCKCHIP_TIMER
-       help
-         This enables support for the ARMv8 based Rockchip chipsets,
-         like the RK3368.
-
-config ARCH_SEATTLE
-       bool "AMD Seattle SoC Family"
-       help
-         This enables support for AMD Seattle SOC Family
-
-config ARCH_SHMOBILE
-       bool
-
-config ARCH_SYNQUACER
-       bool "Socionext SynQuacer SoC Family"
-
 config ARCH_RENESAS
        bool "Renesas SoC Platforms"
-       select ARCH_SHMOBILE
        select PINCTRL
        select PM
        select PM_GENERIC_DOMAINS
        select RENESAS_IRQC
        select SOC_BUS
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_TMU
        help
          This enables support for the ARMv8 based Renesas SoCs.
 
+config ARCH_R8A774A1
+       bool "Renesas RZ/G2M SoC Platform"
+       depends on ARCH_RENESAS
+       help
+         This enables support for the Renesas RZ/G2M SoC.
+
+config ARCH_R8A774C0
+       bool "Renesas RZ/G2E SoC Platform"
+       depends on ARCH_RENESAS
+       help
+         This enables support for the Renesas RZ/G2E SoC.
+
 config ARCH_R8A7795
        bool "Renesas R-Car H3 SoC Platform"
        depends on ARCH_RENESAS
@@ -229,11 +221,31 @@ config ARCH_R8A77995
        help
          This enables support for the Renesas R-Car D3 SoC.
 
+config ARCH_ROCKCHIP
+       bool "Rockchip Platforms"
+       select ARCH_HAS_RESET_CONTROLLER
+       select GPIOLIB
+       select PINCTRL
+       select PINCTRL_ROCKCHIP
+       select PM
+       select ROCKCHIP_TIMER
+       help
+         This enables support for the ARMv8 based Rockchip chipsets,
+         like the RK3368.
+
+config ARCH_SEATTLE
+       bool "AMD Seattle SoC Family"
+       help
+         This enables support for AMD Seattle SOC Family
+
 config ARCH_STRATIX10
        bool "Altera's Stratix 10 SoCFPGA Family"
        help
          This enables support for Altera's Stratix 10 SoCFPGA Family.
 
+config ARCH_SYNQUACER
+       bool "Socionext SynQuacer SoC Family"
+
 config ARCH_TEGRA
        bool "NVIDIA Tegra SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
@@ -302,6 +314,7 @@ config ARCH_ZX
 
 config ARCH_ZYNQMP
        bool "Xilinx ZynqMP Family"
+       select ZYNQMP_FIRMWARE
        help
          This enables support for Xilinx ZynqMP Family