Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / arch / arm64 / Kconfig.platforms

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 73272f43ca012faac98c0aceed350dcd49814b28..f5f0c813dfecc56cf21e0ae18b8b0c34197aad86 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -1,5 +1,11 @@
 menu "Platform selection"
 
+config ARCH_ACTIONS
+       bool "Actions Semi Platforms"
+       select OWL_TIMER
+       help
+         This enables support for the Actions Semiconductor S900 SoC family.
+
 config ARCH_SUNXI
        bool "Allwinner sunxi 64-bit SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
@@ -18,7 +24,7 @@ config ARCH_ALPINE
 
 config ARCH_BCM2835
        bool "Broadcom BCM2835 family"
-       select CLKSRC_OF
+       select TIMER_OF
        select GPIOLIB
        select PINCTRL
        select PINCTRL_BCM2835
@@ -108,11 +114,15 @@ config ARCH_MVEBU
        select ARMADA_37XX_CLK
        select GPIOLIB
        select GPIOLIB_IRQCHIP
+       select MVEBU_GICP
+       select MVEBU_ICU
        select MVEBU_ODMI
        select MVEBU_PIC
        select OF_GPIO
        select PINCTRL
        select PINCTRL_ARMADA_37XX
+       select PINCTRL_ARMADA_AP806
+       select PINCTRL_ARMADA_CP110
        help
          This enables support for Marvell EBU familly, including:
           - Armada 3700 SoC Family
@@ -126,6 +136,12 @@ config ARCH_QCOM
        help
          This enables support for the ARMv8 based Qualcomm chipsets.
 
+config ARCH_REALTEK
+       bool "Realtek Platforms"
+       help
+         This enables support for the ARMv8 based Realtek chipsets,
+         like the RTD1295.
+
 config ARCH_ROCKCHIP
        bool "Rockchip Platforms"
        select ARCH_HAS_RESET_CONTROLLER
@@ -178,7 +194,7 @@ config ARCH_TEGRA
        select ARCH_HAS_RESET_CONTROLLER
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-       select CLKSRC_OF
+       select TIMER_OF
        select GENERIC_CLOCKEVENTS
        select GPIOLIB
        select PINCTRL
@@ -225,10 +241,7 @@ config ARCH_VEXPRESS
          Express).
 
 config ARCH_VULCAN
-       bool "Broadcom Vulcan SOC Family"
-       select GPIOLIB
-       help
-         This enables support for Broadcom Vulcan SoC Family
+       def_bool n
 
 config ARCH_XGENE
        bool "AppliedMicro X-Gene SOC Family"