Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 37 insertions, 1 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index bbd138be6a70..df37594c30f8 100644
--- 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
@@ -126,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
@@ -133,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.
@@ -149,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
@@ -165,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.
@@ -173,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.
@@ -256,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