Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index b6b3657..cfbdf02 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -3,6 +3,8 @@ menu "Platform selection"
 config ARCH_SUNXI
        bool "Allwinner sunxi 64-bit SoC Family"
        select GENERIC_IRQ_CHIP
+       select PINCTRL
+       select PINCTRL_SUN50I_A64
        help
          This enables support for Allwinner sunxi based SoCs like the A64.
 
@@ -42,6 +44,13 @@ config ARCH_BERLIN
        help
          This enables support for Marvell Berlin SoC Family
 
+config ARCH_BRCMSTB
+       bool "Broadcom Set-Top-Box SoCs"
+       select BRCMSTB_L2_IRQ
+       select GENERIC_IRQ_CHIP
+       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
@@ -68,6 +77,7 @@ config ARCH_HISI
        bool "Hisilicon SoC Family"
        select ARM_TIMER_SP804
        select HISILICON_IRQ_MBIGEN if PCI
+       select PINCTRL
        help
          This enables support for Hisilicon ARMv8 SoC family
 
@@ -162,6 +172,8 @@ config ARCH_TEGRA
        select GENERIC_CLOCKEVENTS
        select GPIOLIB
        select PINCTRL
+       select PM
+       select PM_GENERIC_DOMAINS
        select RESET_CONTROLLER
        help
          This enables support for the NVIDIA Tegra SoC family.
@@ -205,6 +217,11 @@ config ARCH_XGENE
        help
          This enables support for AppliedMicro X-Gene SOC Family
 
+config ARCH_ZX
+       bool "ZTE ZX SoC Family"
+       help
+         This enables support for ZTE ZX SoC Family
+
 config ARCH_ZYNQMP
        bool "Xilinx ZynqMP Family"
        help