ARM: rockchip: rk3228: implement function rk3228_restart

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

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 76a6c9f0238b103d2c460b2dafc07a6ef7d71478..657cfa3c3d1259b15d397a910dd42eafa5e3e5c9 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -2,6 +2,7 @@ config ARCH_ROCKCHIP
        bool "Rockchip SoCs" if ARCH_MULTI_V7
        select PIE
        select PINCTRL
+       select PINCTRL_RK3368
        select PINCTRL_ROCKCHIP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC
@@ -19,24 +20,9 @@ config ARCH_ROCKCHIP
        select ARM_AMBA
        select DMADEVICES
        select PL330_DMA
+       select FIQ_GLUE
+       select ARM_ERRATA_818325 if !ARM_TRUSTZONE
+       select ARM_ERRATA_821420 if !ARM_TRUSTZONE
+       select MFD_SYSCON
 
-if ARCH_ROCKCHIP
-
-config RK_DEBUG_UART
-       int "Debug UART"
-       default 2
-       help
-         Select a UART for debugging. -1 disable.
-
-config RK_FPGA
-       bool "FPGA Board"
-
-config DVFS
-        bool "Enable dvfs"
-       default y
-       select PM_OPP
-       select CPU_FREQ
-
-config RK_PL330_DMA_TEST
-       bool "pl330 DMA memcpy test"
-endif
+source "arch/arm/mach-rockchip/Kconfig.common"