Merge commit 'tip/x86/headers' into x86/untangle2

[linux-2.6-omap-h63xx.git] / arch / arm / plat-s3c24xx / Kconfig

diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 2bc4b10f52272e5e785b75099a744a6d6d096684..2c8a2f5d75ffb5a40553047f30c4ea28d7ccd52b 100644 (file)
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -6,8 +6,8 @@
 
 config PLAT_S3C24XX
        bool
-       depends on ARCH_S3C2410
-       default y if ARCH_S3C2410
+       depends on ARCH_S3C2410 || ARCH_S3C24A0
+       default y
        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
        help
@@ -23,6 +23,11 @@ config S3C2410_CLOCK
          Clock code for the S3C2410, and similar processors which
          is currently includes the S3C2410, S3C2440, S3C2442.
 
+config S3C24XX_DCLK
+       bool
+       help
+         Clock code for supporting DCLK/CLKOUT on S3C24XX architectures
+
 config CPU_S3C244X
        bool
        depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
@@ -36,6 +41,27 @@ config S3C24XX_PWM
          Support for exporting the PWM timer blocks via the pwm device
          system.
 
+
+# gpio configurations
+
+config S3C24XX_GPIO_EXTRA
+       int
+       default 128 if S3C24XX_GPIO_EXTRA128
+       default 64 if S3C24XX_GPIO_EXTRA64
+       default 0
+
+config S3C24XX_GPIO_EXTRA64
+       bool
+       help
+         Add an extra 64 gpio numbers to the available GPIO pool. This is
+         available for boards that need extra gpios for external devices.
+
+config S3C24XX_GPIO_EXTRA128
+       bool
+       help
+         Add an extra 128 gpio numbers to the available GPIO pool. This is
+         available for boards that need extra gpios for external devices.
+
 config PM_SIMTEC
        bool
        help
@@ -57,6 +83,13 @@ config S3C2410_DMA_DEBUG
          Enable debugging output for the DMA code. This option sends info
          to the kernel log, at priority KERN_DEBUG.
 
+config S3C24XX_ADC
+       bool "ADC common driver support"
+       help
+         Core support for the ADC block found in the S3C24XX SoC systems
+         for drivers such as the touchscreen and hwmon to use to share
+         this resource.
+
 # SPI default pin configuration code
 
 config S3C24XX_SPI_BUS0_GPE11_GPE12_GPE13