Merge branch 'next-s5pv210' into for-next

1 files changed, 62 insertions, 11 deletions

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 0761eac9aaea..9b84abf1a822 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -27,11 +27,21 @@ config S5PV210_SETUP_I2C2
         help
           Common setup code for i2c bus 2.
 
+config S5PV210_SETUP_IDE
+        bool
+        help
+          Common setup code for S5PV210 IDE GPIO configurations
+
 config S5PV210_SETUP_FB_24BPP
         bool
         help
           Common setup code for S5PV210 with an 24bpp RGB display helper.
 
+config S5PV210_SETUP_KEYPAD
+        bool
+        help
+          Common setup code for keypad.
+
 config S5PV210_SETUP_SDHCI
         bool
         select S5PV210_SETUP_SDHCI_GPIO
@@ -43,14 +53,19 @@ config S5PV210_SETUP_SDHCI_GPIO
         help
           Common setup code for SDHCI gpio.
 
-# machine support
+menu "S5PC110 Machines"
 
 config MACH_AQUILA
-        bool "Samsung Aquila"
+        bool "Aquila"
         select CPU_S5PV210
         select ARCH_SPARSEMEM_ENABLE
         select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_SDHCI
         select S3C_DEV_FB
+        select S5PC110_DEV_ONENAND
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
         help
           Machine support for the Samsung Aquila target based on S5PC110 SoC
 
@@ -58,34 +73,70 @@ config MACH_GONI
         bool "GONI"
         select CPU_S5PV210
         select ARCH_SPARSEMEM_ENABLE
+        select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_SDHCI
+        select S3C_DEV_FB
+        select S5PC110_DEV_ONENAND
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
         help
           Machine support for Samsung GONI board
           S5PC110(MCP) is one of package option of S5PV210
 
+config MACH_SMDKC110
+        bool "SMDKC110"
+        select CPU_S5PV210
+        select ARCH_SPARSEMEM_ENABLE
+        select S3C_DEV_I2C1
+        select S3C_DEV_I2C2
+        select SAMSUNG_DEV_IDE
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
+        select HAVE_S3C_RTC
+        select HAVE_S3C2410_WATCHDOG
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
+        help
+          Machine support for Samsung SMDKC110
+          S5PC110(MCP) is one of package option of S5PV210
+
+endmenu
+
 config S5PC110_DEV_ONENAND
         bool
         help
           Compile in platform device definition for OneNAND1 controller
 
+menu "S5PV210 Machines"
+
 config MACH_SMDKV210
         bool "SMDKV210"
         select CPU_S5PV210
         select ARCH_SPARSEMEM_ENABLE
         select SAMSUNG_DEV_ADC
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
+        select S3C_DEV_HSMMC3
+        select S3C_DEV_I2C1
+        select S3C_DEV_I2C2
+        select SAMSUNG_DEV_IDE
+        select SAMSUNG_DEV_KEYPAD
         select SAMSUNG_DEV_TS
+        select S3C_DEV_RTC
         select S3C_DEV_WDT
+        select HAVE_S3C_RTC
         select HAVE_S3C2410_WATCHDOG
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
+        select S5PV210_SETUP_KEYPAD
+        select S5PV210_SETUP_SDHCI
         help
           Machine support for Samsung SMDKV210
 
-config MACH_SMDKC110
-        bool "SMDKC110"
-        select CPU_S5PV210
-        select ARCH_SPARSEMEM_ENABLE
-        select S3C_DEV_WDT
-        select HAVE_S3C2410_WATCHDOG
-        help
-          Machine support for Samsung SMDKC110
-          S5PC110(MCP) is one of package option of S5PV210
+endmenu
 
 endif