ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-vexpress / Kconfig

diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 5907e10c37fd6eef7616a1bd6020a986a200c3d9..10f9389572da2e8a6fb9fb59824f3b8d3fea4c64 100644 (file)
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -1,29 +1,26 @@
-config ARCH_VEXPRESS
+menuconfig ARCH_VEXPRESS
        bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
+       select ARCH_SUPPORTS_BIG_ENDIAN
        select ARM_AMBA
        select ARM_GIC
+       select ARM_GLOBAL_TIMER
        select ARM_TIMER_SP804
-       select CLKDEV_LOOKUP
-       select COMMON_CLK
        select COMMON_CLK_VERSATILE
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
-       select HAVE_ARM_TWD if LOCAL_TIMERS
-       select HAVE_CLK
+       select HAVE_ARM_TWD if SMP
        select HAVE_PATA_PLATFORM
-       select HAVE_SMP
        select ICST
-       select MIGHT_HAVE_CACHE_L2X0
-       select NO_IOPORT
+       select NO_IOPORT_MAP
        select PLAT_VERSATILE
-       select PLAT_VERSATILE_CLCD
        select POWER_RESET
        select POWER_RESET_VEXPRESS
        select POWER_SUPPLY
+       select REGULATOR if MMC_ARMMMCI
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select VEXPRESS_CONFIG
+       select VEXPRESS_SYSCFG
+       select MFD_VEXPRESS_SYSREG
        help
          This option enables support for systems using Cortex processor based
          ARM core and logic (FPGA) tiles on the Versatile Express motherboard,
@@ -40,21 +37,46 @@ config ARCH_VEXPRESS
          platforms. The traditional (ATAGs) boot method is not usable on
          these boards with this option.
 
-menu "Versatile Express platform type"
-       depends on ARCH_VEXPRESS
+if ARCH_VEXPRESS
 
 config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
        bool "Enable A5 and A9 only errata work-arounds"
        default y
+       select ARM_ERRATA_643719 if SMP
        select ARM_ERRATA_720789
-       select PL310_ERRATA_753970 if CACHE_PL310
+       select PL310_ERRATA_753970 if CACHE_L2X0
        help
          Provides common dependencies for Versatile Express platforms
          based on Cortex-A5 and Cortex-A9 processors. In order to
          build a working kernel, you must also enable relevant core
          tile support or Flattened Device Tree based support options.
 
-config ARCH_VEXPRESS_CA9X4
-       bool "Versatile Express Cortex-A9x4 tile"
+config ARCH_VEXPRESS_DCSCB
+       bool "Dual Cluster System Control Block (DCSCB) support"
+       depends on MCPM
+       select ARM_CCI400_PORT_CTRL
+       help
+         Support for the Dual Cluster System Configuration Block (DCSCB).
+         This is needed to provide CPU and cluster power management
+         on RTSM implementing big.LITTLE.
+
+config ARCH_VEXPRESS_SPC
+       bool "Versatile Express Serial Power Controller (SPC)"
+       select PM_OPP
+       help
+         The TC2 (A15x2 A7x3) versatile express core tile integrates a logic
+         block called Serial Power Controller (SPC) that provides the interface
+         between the dual cluster test-chip and the M3 microcontroller that
+         carries out power management.
+
+config ARCH_VEXPRESS_TC2_PM
+       bool "Versatile Express TC2 power management"
+       depends on MCPM
+       select ARM_CCI400_PORT_CTRL
+       select ARCH_VEXPRESS_SPC
+       select ARM_CPU_SUSPEND
+       help
+         Support for CPU and cluster power management on Versatile Express
+         with a TC2 (A15x2 A7x3) big.LITTLE core tile.
 
-endmenu
+endif