1 files changed, 19 insertions, 4 deletions

diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 557f8c507f6d..849229716586 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -7,10 +7,10 @@
 
 config PLAT_S5P
         bool
-        depends on (ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310)
+        depends on (ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4)
         default y
-        select ARM_VIC if !ARCH_S5PV310
-        select ARM_GIC if ARCH_S5PV310
+        select ARM_VIC if !ARCH_EXYNOS4
+        select ARM_GIC if ARCH_EXYNOS4
         select NO_IOPORT
         select ARCH_REQUIRE_GPIOLIB
         select S3C_GPIO_TRACK
@@ -37,11 +37,16 @@ config S5P_GPIO_INT
         help
           Common code for the GPIO interrupts (other than external interrupts.)
 
+config S5P_HRT
+        bool
+        help
+          Use the High Resolution timer support
+
 comment "System MMU"
 
 config S5P_SYSTEM_MMU
         bool "S5P SYSTEM MMU"
-        depends on ARCH_S5PV310
+        depends on ARCH_EXYNOS4
         help
           Say Y here if you want to enable System MMU
 
@@ -60,6 +65,11 @@ config S5P_DEV_FIMC2
         help
           Compile in platform device definitions for FIMC controller 2
 
+config S5P_DEV_FIMC3
+        bool
+        help
+          Compile in platform device definitions for FIMC controller 3
+
 config S5P_DEV_ONENAND
         bool
         help
@@ -74,3 +84,8 @@ config S5P_DEV_CSIS1
         bool
         help
           Compile in platform device definitions for MIPI-CSIS channel 1
+
+config S5P_SETUP_MIPIPHY
+        bool
+        help
+          Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices