Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux

[cascardo/linux.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4c704b4..54b479c 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -7,6 +7,7 @@ config ARCH_SH7367
        select CPU_V6
        select HAVE_CLK
        select COMMON_CLKDEV
+       select SH_CLK_CPG
        select GENERIC_CLOCKEVENTS
 
 config ARCH_SH7377
@@ -14,6 +15,7 @@ config ARCH_SH7377
        select CPU_V7
        select HAVE_CLK
        select COMMON_CLKDEV
+       select SH_CLK_CPG
        select GENERIC_CLOCKEVENTS
 
 config ARCH_SH7372
@@ -21,6 +23,7 @@ config ARCH_SH7372
        select CPU_V7
        select HAVE_CLK
        select COMMON_CLKDEV
+       select SH_CLK_CPG
        select GENERIC_CLOCKEVENTS
 
 comment "SH-Mobile Board Type"
@@ -39,6 +42,20 @@ config MACH_AP4EVB
        bool "AP4EVB board"
        depends on ARCH_SH7372
        select ARCH_REQUIRE_GPIOLIB
+       select SH_LCD_MIPI_DSI
+
+choice
+       prompt "AP4EVB LCD panel selection"
+       default AP4EVB_QHD
+       depends on MACH_AP4EVB
+
+config AP4EVB_QHD
+       bool "MIPI-DSI QHD (960x540)"
+
+config AP4EVB_WVGA
+       bool "Parallel WVGA (800x480)"
+
+endchoice
 
 comment "SH-Mobile System Configuration"
 
@@ -88,6 +105,15 @@ config SH_TIMER_CMT
        help
          This enables build of the CMT timer driver.
 
+config SH_TIMER_TMU
+       bool "TMU timer driver"
+       default y
+       help
+         This enables build of the TMU timer driver.
+
 endmenu
 
+config SH_CLK_CPG
+       bool
+
 endif