1 files changed, 83 insertions, 12 deletions

diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 31656c33e05e..de9383814e5e 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -6,34 +6,32 @@
 
 config PLAT_S3C
         bool
-        depends on ARCH_S3C2410
-        default y if ARCH_S3C2410
+        depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX
+        default y
         select NO_IOPORT
         help
           Base platform code for any Samsung S3C device
 
 # low-level serial option nodes
 
+if PLAT_S3C
+
 config CPU_LLSERIAL_S3C2410_ONLY
         bool
-        depends on ARCH_S3C2410
         default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
 
 config CPU_LLSERIAL_S3C2440_ONLY
         bool
-        depends on ARCH_S3C2410
         default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
 
 config CPU_LLSERIAL_S3C2410
         bool
-        depends on ARCH_S3C2410
         help
           Selected if there is an S3C2410 (or register compatible) serial
           low-level implementation needed
 
 config CPU_LLSERIAL_S3C2440
         bool
-        depends on ARCH_S3C2410
         help
           Selected if there is an S3C2440 (or register compatible) serial
           low-level implementation needed
@@ -44,7 +42,7 @@ comment "Boot options"
 
 config S3C_BOOT_WATCHDOG
         bool "S3C Initialisation watchdog"
-        depends on PLAT_S3C && S3C2410_WATCHDOG
+        depends on S3C2410_WATCHDOG
         help
           Say y to enable the watchdog during the kernel decompression
           stage. If the kernel fails to uncompress, then the watchdog
@@ -52,16 +50,22 @@ config S3C_BOOT_WATCHDOG
 
 config S3C_BOOT_ERROR_RESET
         bool "S3C Reboot on decompression error"
-        depends on PLAT_S3C
         help
           Say y here to use the watchdog to reset the system if the
           kernel decompressor detects an error during decompression.
 
+config S3C_BOOT_UART_FORCE_FIFO
+       bool "Force UART FIFO on during boot process"
+       default y
+       help
+         Say Y here to force the UART FIFOs on during the kernel
+         uncompressor
+
 comment "Power management"
 
 config S3C2410_PM_DEBUG
         bool "S3C2410 PM Suspend debug"
-        depends on PLAT_S3C && PM
+        depends on PM
         help
           Say Y here if you want verbose debugging from the PM Suspend and
           Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
@@ -69,7 +73,7 @@ config S3C2410_PM_DEBUG
 
 config S3C2410_PM_CHECK
         bool "S3C2410 PM Suspend Memory CRC"
-        depends on PLAT_S3C && PM && CRC32
+        depends on PM && CRC32
         help
           Enable the PM code's memory area checksum over sleep. This option
           will generate CRCs of all blocks of memory, and store them before
@@ -83,7 +87,7 @@ config S3C2410_PM_CHECK
 
 config S3C2410_PM_CHECK_CHUNKSIZE
         int "S3C2410 PM Suspend CRC Chunksize (KiB)"
-        depends on PLAT_S3C && PM && S3C2410_PM_CHECK
+        depends on PM && S3C2410_PM_CHECK
         default 64
         help
           Set the chunksize in Kilobytes of the CRC for checking memory
@@ -95,10 +99,77 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config S3C_LOWLEVEL_UART_PORT
         int "S3C UART to use for low-level messages"
-        depends on PLAT_S3C
         default 0
         help
           Choice of which UART port to use for the low-level messages,
           such as the `Uncompressing...` at start time. The value of
           this configuration should be between zero and two. The port
           must have been initialised by the boot-loader before use.
+
+# options for gpiolib support
+
+config S3C_GPIO_SPACE
+        int "Space between gpio banks"
+        default 0
+        help
+          Add a number of spare GPIO entries between each bank for debugging
+          purposes. This allows any problems where an counter overflows from
+          one bank to another to be caught, at the expense of using a little
+          more memory.
+
+config S3C_GPIO_TRACK
+        bool
+        help
+          Internal configuration option to enable the s3c specific gpio
+          chip tracking if the platform requires it.
+
+config S3C_GPIO_PULL_UPDOWN
+        bool
+        help
+          Internal configuration to enable the correct GPIO pull helper
+
+config S3C_GPIO_PULL_DOWN
+        bool
+        help
+          Internal configuration to enable the correct GPIO pull helper
+
+config S3C_GPIO_PULL_UP
+        bool
+        help
+          Internal configuration to enable the correct GPIO pull helper
+
+config S3C_GPIO_CFG_S3C24XX
+        bool
+        help
+          Internal configuration to enable S3C24XX style GPIO configuration
+          functions.
+
+config S3C_GPIO_CFG_S3C64XX
+        bool
+        help
+          Internal configuration to enable S3C64XX style GPIO configuration
+          functions.
+
+# device definitions to compile in
+
+config S3C_DEV_HSMMC
+        bool
+        help
+          Compile in platform device definitions for HSMMC code
+
+config S3C_DEV_HSMMC1
+        bool
+        help
+          Compile in platform device definitions for HSMMC channel 1
+
+config S3C_DEV_I2C1
+        bool
+        help
+          Compile in platform device definitions for I2C channel 1
+
+config S3C_DEV_FB
+        bool
+        help
+          Compile in platform device definition for framebuffer
+
+endif