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

[sfrench/cifs-2.6.git] / arch / arm / mach-hisi / Kconfig

diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 3b010fe7c0e9b486b9e408c7699f895aca1e7973..2e980f834a6aa1b183fbf9839697b7a8e84d0362 100644 (file)
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config ARCH_HISI
        bool "Hisilicon SoC Support"
-       depends on ARCH_MULTI_V7
+       depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
        select ARM_AMBA
-       select ARM_GIC
+       select ARM_GIC if ARCH_MULTI_V7
        select ARM_TIMER_SP804
        select POWER_RESET
        select POWER_RESET_HISI
@@ -15,6 +15,7 @@ menu "Hisilicon platform type"
 
 config ARCH_HI3xxx
        bool "Hisilicon Hi36xx family"
+       depends on ARCH_MULTI_V7
        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
@@ -25,6 +26,7 @@ config ARCH_HI3xxx
 
 config ARCH_HIP01
        bool "Hisilicon HIP01 family"
+       depends on ARCH_MULTI_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ARM_GLOBAL_TIMER
@@ -33,6 +35,7 @@ config ARCH_HIP01
 
 config ARCH_HIP04
        bool "Hisilicon HiP04 Cortex A15 family"
+       depends on ARCH_MULTI_V7
        select ARM_ERRATA_798181 if SMP
        select HAVE_ARM_ARCH_TIMER
        select MCPM if SMP
@@ -43,6 +46,7 @@ config ARCH_HIP04
 
 config ARCH_HIX5HD2
        bool "Hisilicon X5HD2 family"
+       depends on ARCH_MULTI_V7
        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
@@ -50,6 +54,14 @@ config ARCH_HIX5HD2
        select PINCTRL_SINGLE
        help
          Support for Hisilicon HIX5HD2 SoC family
+
+config ARCH_SD5203
+       bool "Hisilicon SD5203 family"
+       depends on ARCH_MULTI_V5
+       select DW_APB_ICTL
+       help
+         Support for Hisilicon SD5203 SoC family
+
 endmenu
 
 endif