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

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

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 2182fd5c81538fbce1a3f8148b61366eba89cb7d..bb2616b161576b4a664536ccae5c761544e93167 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -13,6 +13,19 @@ config ARCH_ALPINE
          This enables support for the Annapurna Labs Alpine
          Soc family.
 
+config ARCH_BCM2835
+       bool "Broadcom BCM2835 family"
+       select ARCH_REQUIRE_GPIOLIB
+       select CLKSRC_OF
+       select PINCTRL
+       select PINCTRL_BCM2835
+       select ARM_AMBA
+       select ARM_TIMER_SP804
+       select HAVE_ARM_ARCH_TIMER
+       help
+         This enables support for the Broadcom BCM2837 SoC.
+         This SoC is used in the Raspberry Pi 3 device.
+
 config ARCH_BCM_IPROC
        bool "Broadcom iProc SoC Family"
        select COMMON_CLK_IPROC
@@ -36,6 +49,7 @@ config ARCH_EXYNOS
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
+       select SOC_SAMSUNG
        help
          This enables support for ARMv8 based Samsung Exynos SoC family.
 
@@ -66,6 +80,10 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
        bool "Amlogic Platforms"
+       select PINCTRL
+       select PINCTRL_MESON
+       select COMMON_CLK_AMLOGIC
+       select COMMON_CLK_GXBB
        help
          This enables support for the Amlogic S905 SoCs.
 
@@ -73,6 +91,7 @@ config ARCH_MVEBU
        bool "Marvell EBU SoC Family"
        select ARMADA_AP806_SYSCON
        select ARMADA_CP110_SYSCON
+       select ARMADA_37XX_CLK
        select MVEBU_ODMI
        help
          This enables support for Marvell EBU familly, including:
@@ -166,6 +185,8 @@ config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK_VERSATILE
+       select PM
+       select PM_GENERIC_DOMAINS
        select POWER_RESET_VEXPRESS
        select VEXPRESS_CONFIG
        help
@@ -174,6 +195,7 @@ config ARCH_VEXPRESS
 
 config ARCH_VULCAN
        bool "Broadcom Vulcan SOC Family"
+       select GPIOLIB
        help
          This enables support for Broadcom Vulcan SoC Family