Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / arch / arm / mach-s5pv310 / Kconfig

diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig
index 4de5d72..1150b36 100644 (file)
--- a/arch/arm/mach-s5pv310/Kconfig
+++ b/arch/arm/mach-s5pv310/Kconfig
@@ -11,7 +11,6 @@ if ARCH_S5PV310
 
 config CPU_S5PV310
        bool
-       select PLAT_S5P
        help
          Enable S5PV310 CPU support
 
@@ -25,6 +24,42 @@ config S5PV310_SETUP_I2C2
        help
          Common setup code for i2c bus 2.
 
+config S5PV310_SETUP_I2C3
+       bool
+       help
+         Common setup code for i2c bus 3.
+
+config S5PV310_SETUP_I2C4
+       bool
+       help
+         Common setup code for i2c bus 4.
+
+config S5PV310_SETUP_I2C5
+       bool
+       help
+         Common setup code for i2c bus 5.
+
+config S5PV310_SETUP_I2C6
+       bool
+       help
+         Common setup code for i2c bus 6.
+
+config S5PV310_SETUP_I2C7
+       bool
+       help
+         Common setup code for i2c bus 7.
+
+config S5PV310_SETUP_SDHCI
+       bool
+       select S5PV310_SETUP_SDHCI_GPIO
+       help
+         Internal helper functions for S5PV310 based SDHCI systems.
+
+config S5PV310_SETUP_SDHCI_GPIO
+       bool
+       help
+         Common setup code for SDHCI gpio.
+
 # machine support
 
 menu "S5PC210 Machines"
@@ -32,8 +67,13 @@ menu "S5PC210 Machines"
 config MACH_SMDKC210
        bool "SMDKC210"
        select CPU_S5PV310
-       select ARCH_SPARSEMEM_ENABLE
        select S3C_DEV_RTC
+       select S3C_DEV_WDT
+       select S3C_DEV_HSMMC
+       select S3C_DEV_HSMMC1
+       select S3C_DEV_HSMMC2
+       select S3C_DEV_HSMMC3
+       select S5PV310_SETUP_SDHCI
        help
          Machine support for Samsung SMDKC210
          S5PC210(MCP) is one of package option of S5PV310
@@ -41,7 +81,9 @@ config MACH_SMDKC210
 config MACH_UNIVERSAL_C210
        bool "Mobile UNIVERSAL_C210 Board"
        select CPU_S5PV310
-       select ARCH_SPARSEMEM_ENABLE
+       select S5P_DEV_ONENAND
+       select S3C_DEV_I2C1
+       select S5PV310_SETUP_I2C1
        help
          Machine support for Samsung Mobile Universal S5PC210 Reference
          Board. S5PC210(MCP) is one of package option of S5PV310
@@ -53,11 +95,34 @@ menu "S5PV310 Machines"
 config MACH_SMDKV310
        bool "SMDKV310"
        select CPU_S5PV310
-       select ARCH_SPARSEMEM_ENABLE
        select S3C_DEV_RTC
+       select S3C_DEV_WDT
+       select S3C_DEV_HSMMC
+       select S3C_DEV_HSMMC1
+       select S3C_DEV_HSMMC2
+       select S3C_DEV_HSMMC3
+       select S5PV310_SETUP_SDHCI
        help
          Machine support for Samsung SMDKV310
 
 endmenu
 
+comment "Configuration for HSMMC bus width"
+
+menu "Use 8-bit bus width"
+
+config S5PV310_SDHCI_CH0_8BIT
+       bool "Channel 0 with 8-bit bus"
+       help
+         Support HSMMC Channel 0 8-bit bus.
+         If selected, Channel 1 is disabled.
+
+config S5PV310_SDHCI_CH2_8BIT
+       bool "Channel 2 with 8-bit bus"
+       help
+         Support HSMMC Channel 2 8-bit bus.
+         If selected, Channel 3 is disabled.
+
+endmenu
+
 endif