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

[android-x86/kernel.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 2c04116..21074f6 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -9,6 +9,7 @@ config ARCH_BERLIN
        bool "Marvell Berlin SoC Family"
        select ARCH_REQUIRE_GPIOLIB
        select DW_APB_ICTL
+       select PINCTRL
        help
          This enables support for Marvell Berlin SoC Family
 
@@ -43,6 +44,7 @@ config ARCH_MEDIATEK
        bool "Mediatek MT65xx & MT81xx ARMv8 SoC"
        select ARM_GIC
        select PINCTRL
+       select MTK_TIMER
        help
          Support for Mediatek MT65xx & MT81xx ARMv8 SoCs
 
@@ -67,6 +69,23 @@ config ARCH_SEATTLE
        help
          This enables support for AMD Seattle SOC Family
 
+config ARCH_SHMOBILE
+       bool
+
+config ARCH_RENESAS
+       bool "Renesas SoC Platforms"
+       select ARCH_SHMOBILE
+       select PINCTRL
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for the ARMv8 based Renesas SoCs.
+
+config ARCH_R8A7795
+       bool "Renesas R-Car H3 SoC Platform"
+       depends on ARCH_RENESAS
+       help
+         This enables support for the Renesas R-Car H3 SoC.
+
 config ARCH_STRATIX10
        bool "Altera's Stratix 10 SoCFPGA Family"
        help
@@ -96,6 +115,12 @@ config ARCH_THUNDER
        help
          This enables support for Cavium's Thunder Family of SoCs.
 
+config ARCH_UNIPHIER
+       bool "Socionext UniPhier SoC Family"
+       select PINCTRL
+       help
+         This enables support for Socionext UniPhier SoC family.
+
 config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB