Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index f5d9cd4..df37594 100644 (file)
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -2,6 +2,13 @@ if ARCH_S3C2410
 
 menu "S3C24XX Implementations"
 
+config MACH_AML_M5900
+       bool "AML M5900 Series"
+       select CPU_S3C2410
+       help
+          Say Y here if you are using the American Microsystems M5900 Series
+           <http://www.amltd.com>
+
 config MACH_ANUBIS
        bool "Simtec Electronics ANUBIS"
        select CPU_S3C2440
@@ -71,19 +78,27 @@ config ARCH_S3C2440
          Say Y here if you are using the SMDK2440.
 
 config SMDK2440_CPU2440
-       bool "SMDK2440 with S3C2440 cpu module"
+       bool "SMDK2440 with S3C2440 CPU module"
        depends on ARCH_S3C2440
        default y if ARCH_S3C2440
        select CPU_S3C2440
 
 config SMDK2440_CPU2442
-       bool "SMDM2440 with S3C2442 cpu module"
+       bool "SMDM2440 with S3C2442 CPU module"
        depends on ARCH_S3C2440
        select CPU_S3C2442
 
+config MACH_S3C2413
+       bool
+       help
+         Internal node for S3C2413 verison of SMDK2413, so that
+         machine_is_s3c2413() will work when MACH_SMDK2413 is
+         selected
+
 config MACH_SMDK2413
        bool "SMDK2413"
        select CPU_S3C2412
+       select MACH_S3C2413
        select MACH_SMDK
        help
          Say Y here if you are using an SMDK2413
@@ -118,6 +133,12 @@ config MACH_NEXCODER_2440
        help
          Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
 
+config MACH_VSTMS
+       bool "VMSTMS"
+       select CPU_S3C2412
+       help
+         Say Y here if you are using an VSTMS board
+
 endmenu
 
 config S3C2410_CLOCK
@@ -125,10 +146,24 @@ config S3C2410_CLOCK
        help
          Clock code for the S3C2410, and similar processors
 
+config S3C2410_PM
+       bool
+       depends on CONFIG_PM
+       help
+         Power Management code common to S3C2410 and better
+
+config CPU_S3C2410_DMA
+       bool
+       depends on S3C2410_DMA && (CPU_S3C2410 || CPU_S3C2442)
+       default y if CPU_S3C2410 || CPU_S3C2442
+       help
+         DMA device selection for S3C2410 and compatible CPUs
+
 config CPU_S3C2410
        bool
        depends on ARCH_S3C2410
        select S3C2410_CLOCK
+       select S3C2410_PM
        help
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.
@@ -141,6 +176,13 @@ config CPU_S3C2412_ONLY
                   !CPU_S3C2440 && !CPU_S3C2442 && CPU_S3C2412
        default y if CPU_S3C2412
 
+config S3C2412_PM
+       bool
+       default y if PM
+       depends on CPU_S3C2412
+       help
+         Internal config node to apply S3C2412 power management
+
 config CPU_S3C2412
        bool
        depends on ARCH_S3C2410
@@ -157,6 +199,7 @@ config CPU_S3C2440
        bool
        depends on ARCH_S3C2410
        select S3C2410_CLOCK
+       select S3C2410_PM
        select CPU_S3C244X
        help
          Support for S3C2440 Samsung Mobile CPU based systems.
@@ -165,6 +208,7 @@ config CPU_S3C2442
        bool
        depends on ARCH_S3C2420
        select S3C2410_CLOCK
+       select S3C2410_PM
        select CPU_S3C244X
        help
          Support for S3C2442 Samsung Mobile CPU based systems.
@@ -248,7 +292,7 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config PM_SIMTEC
        bool
-       depends on PM && (ARCH_BAST || MACH_VR1000)
+       depends on PM && (ARCH_BAST || MACH_VR1000 || MACH_AML_M5900)
        default y
 
 config S3C2410_LOWLEVEL_UART_PORT