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 ...
author: Linus Torvalds <torvalds@g5.osdl.org> 2006-09-28 17:40:39 -0400
committer: Linus Torvalds <torvalds@g5.osdl.org> 2006-09-28 17:40:39 -0400
commit: ebdea46fecae40c4d7effcd33f40918a37a1df4b (patch)
tree: e4312bf7f1f3d184738963a0ec300aa9fdfd55c1 /arch/arm/mach-s3c2410
parent: fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (diff)
parent: 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (diff)
31 files changed, 1768 insertions, 308 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
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 0eadec916214..d66013365b6b 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -9,6 +9,8 @@ obj-y			:= cpu.o irq.o time.o gpio.o clock.o devs.o
 obj-m                   :=
 obj-n                   :=
 obj-                    :=
+obj-dma-y               :=
+obj-dma-n               :=
 # DMA
 obj-$(CONFIG_S3C2410_DMA)       += dma.o
@@ -20,6 +22,10 @@ obj-$(CONFIG_CPU_S3C2400)	+= s3c2400-gpio.o
 obj-$(CONFIG_CPU_S3C2410)       += s3c2410.o
 obj-$(CONFIG_CPU_S3C2410)       += s3c2410-gpio.o
+obj-$(CONFIG_CPU_S3C2410)       += s3c2410-irq.o
+obj-$(CONFIG_S3C2410_PM)        += s3c2410-pm.o s3c2410-sleep.o
+obj-$(CONFIG_CPU_S3C2410_DMA)   += s3c2410-dma.o
 # Power Management support
@@ -30,6 +36,9 @@ obj-$(CONFIG_PM_SIMTEC)		+= pm-simtec.o
 obj-$(CONFIG_CPU_S3C2412)       += s3c2412.o
 obj-$(CONFIG_CPU_S3C2412)       += s3c2412-irq.o
 obj-$(CONFIG_CPU_S3C2412)       += s3c2412-clock.o
+obj-dma-$(CONFIG_CPU_S3C2412)   += s3c2412-dma.o
+obj-$(CONFIG_S3C2412_PM)        += s3c2412-pm.o
 #
 # S3C244X support
@@ -47,6 +56,7 @@ obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o s3c2440-dsc.o
 obj-$(CONFIG_CPU_S3C2440)       += s3c2440-irq.o
 obj-$(CONFIG_CPU_S3C2440)       += s3c2440-clock.o
 obj-$(CONFIG_CPU_S3C2440)       += s3c2410-gpio.o
+obj-dma-$(CONFIG_CPU_S3C2440)   += s3c2440-dma.o
 # S3C2442 support
@@ -57,8 +67,13 @@ obj-$(CONFIG_CPU_S3C2442)	+= s3c2442-clock.o
 obj-$(CONFIG_BAST_PC104_IRQ)    += bast-irq.o
+# merge in dma objects
+obj-y                           += $(obj-dma-y)
 # machine specific support
+obj-$(CONFIG_MACH_AML_M5900)    += mach-amlm5900.o
 obj-$(CONFIG_MACH_ANUBIS)       += mach-anubis.o
 obj-$(CONFIG_MACH_OSIRIS)       += mach-osiris.o
 obj-$(CONFIG_ARCH_BAST)         += mach-bast.o usb-simtec.o
@@ -71,5 +86,6 @@ obj-$(CONFIG_MACH_VR1000)	+= mach-vr1000.o usb-simtec.o
 obj-$(CONFIG_MACH_RX3715)       += mach-rx3715.o
 obj-$(CONFIG_MACH_OTOM)         += mach-otom.o
 obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
+obj-$(CONFIG_MACH_VSTMS)        += mach-vstms.o
 obj-$(CONFIG_MACH_SMDK)         += common-smdk.o
 \ No newline at end of file
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index def4441d2442..440e9aa0211a 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -18,10 +18,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Modifications:
- *     08-Jan-2003 BJD  Moved from central IRQ code
- *     21-Aug-2005 BJD  Fixed missing code and compile errors
 */
diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c
index 1c3c6adae6c4..9d4899eddf1f 100644
--- a/arch/arm/mach-s3c2410/cpu.c
+++ b/arch/arm/mach-s3c2410/cpu.c
@@ -124,6 +124,15 @@ static struct cpu_table cpu_ids[] __initdata = {
                .init           = s3c2412_init,
                .name           = name_s3c2412,
        },
+        {                       /* a newer version of the s3c2412 */
+                .idcode         = 0x32412003,
+                .idmask         = 0xffffffff,
+                .map_io         = s3c2412_map_io,
+                .init_clocks    = s3c2412_init_clocks,
+                .init_uarts     = s3c2412_init_uarts,
+                .init           = s3c2412_init,
+                .name           = name_s3c2412,
+        },
        {
                .idcode         = 0x0,   /* S3C2400 doesn't have an idcode */
                .idmask         = 0xffffffff,
diff --git a/arch/arm/mach-s3c2410/devs.h b/arch/arm/mach-s3c2410/devs.h
index 726e2eaf8797..14fb0bade716 100644
--- a/arch/arm/mach-s3c2410/devs.h
+++ b/arch/arm/mach-s3c2410/devs.h
@@ -8,11 +8,6 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *      18-Aug-2004 BJD  Created initial version
- *      27-Aug-2004 BJD  Added timers 0 through 3
- *      10-Feb-2005 BJD  Added camera from guillaume.gourat@nexvision.tv
 */
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index cc92a7b2db88..d264bbbd8bef 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -1,35 +1,16 @@
-/* linux/arch/arm/mach-bast/dma.c
+/* linux/arch/arm/mach-s3c2410/dma.c
 *
- * (c) 2003-2005 Simtec Electronics
+ * (c) 2003-2005,2006 Simtec Electronics
 *      Ben Dooks <ben@simtec.co.uk>
 *
 * S3C2410 DMA core
 *
- * http://www.simtec.co.uk/products/EB2410ITX/
+ * http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
+*/
- * Changelog:
- *  27-Feb-2005 BJD  Added kmem cache for dma descriptors
- *  18-Nov-2004 BJD  Removed error for loading onto stopped channel
- *  10-Nov-2004 BJD  Ensure all external symbols exported for modules
- *  10-Nov-2004 BJD  Use sys_device and sysdev_class for power management
- *  08-Aug-2004 BJD  Apply rmk's suggestions
- *  21-Jul-2004 BJD  Ported to linux 2.6
- *  12-Jul-2004 BJD  Finished re-write and change of API
- *  06-Jul-2004 BJD  Rewrote dma code to try and cope with various problems
- *  23-May-2003 BJD  Created file
- *  19-Aug-2003 BJD  Cleanup, header fix, added URL
- *
- * This file is based on the Sangwook Lee/Samsung patches, re-written due
- * to various ommisions from the code (such as flexible dma configuration)
- * for use with the BAST system board.
- *
- * The re-write is pretty much complete, and should be good enough for any
- * possible DMA function
- */
 #ifdef CONFIG_S3C2410_DMA_DEBUG
@@ -55,10 +36,14 @@
 #include <asm/mach/dma.h>
 #include <asm/arch/map.h>
+#include "dma.h"
 /* io map for dma */
 static void __iomem *dma_base;
 static kmem_cache_t *dma_kmem;
+struct s3c24xx_dma_selection dma_sel;
 /* dma channel state information */
 struct s3c2410_dma_chan s3c2410_chans[S3C2410_DMA_CHANNELS];
@@ -79,7 +64,6 @@ dma_wrreg(struct s3c2410_dma_chan *chan, int reg, unsigned long val)
        pr_debug("writing %08x to register %08x\n",(unsigned int)val,reg);
        writel(val, dma_regaddr(chan, reg));
 }
 #endif
 #define dma_rdreg(chan, reg) readl((chan)->regs + (reg))
@@ -151,12 +135,20 @@ dmadbg_showregs(const char *fname, int line, struct s3c2410_dma_chan *chan)
 #define dbg_showchan(chan) do { } while(0)
 #endif /* CONFIG_S3C2410_DMA_DEBUG */
-#define check_channel(chan) \
+static struct s3c2410_dma_chan *dma_chan_map[DMACH_MAX];
-  do { if ((chan) >= S3C2410_DMA_CHANNELS) { \
-    printk(KERN_ERR "%s: invalid channel %d\n", __FUNCTION__, (chan)); \
-    return -EINVAL; \
-  } } while(0)
+/* lookup_dma_channel
+ *
+ * change the dma channel number given into a real dma channel id
+*/
+static struct s3c2410_dma_chan *lookup_dma_channel(unsigned int channel)
+{
+        if (channel & DMACH_LOW_LEVEL)
+                return &s3c2410_chans[channel & ~DMACH_LOW_LEVEL];
+        else
+                return dma_chan_map[channel];
+}
 /* s3c2410_dma_stats_timeout
 *
@@ -321,8 +313,10 @@ static inline void
 s3c2410_dma_buffdone(struct s3c2410_dma_chan *chan, struct s3c2410_dma_buf *buf,
                     enum s3c2410_dma_buffresult result)
 {
+#if 0
        pr_debug("callback_fn=%p, buf=%p, id=%p, size=%d, result=%d\n",
                 chan->callback_fn, buf, buf->id, buf->size, result);
+#endif
        if (chan->callback_fn != NULL) {
                (chan->callback_fn)(chan, buf->id, buf->size, result);
@@ -439,7 +433,6 @@ s3c2410_dma_canload(struct s3c2410_dma_chan *chan)
        return 0;
 }
 /* s3c2410_dma_enqueue
 *
 * queue an given buffer for dma transfer.
@@ -460,11 +453,12 @@ s3c2410_dma_canload(struct s3c2410_dma_chan *chan)
 int s3c2410_dma_enqueue(unsigned int channel, void *id,
                        dma_addr_t data, int size)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
        struct s3c2410_dma_buf *buf;
        unsigned long flags;
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        pr_debug("%s: id=%p, data=%08x, size=%d\n",
                 __FUNCTION__, id, (unsigned int)data, size);
@@ -562,8 +556,10 @@ s3c2410_dma_freebuf(struct s3c2410_dma_buf *buf)
 static inline void
 s3c2410_dma_lastxfer(struct s3c2410_dma_chan *chan)
 {
+#if 0
        pr_debug("dma%d: s3c2410_dma_lastxfer: load_state %d\n",
                 chan->number, chan->load_state);
+#endif
        switch (chan->load_state) {
        case S3C2410_DMALOAD_NONE:
@@ -718,7 +714,8 @@ s3c2410_dma_irq(int irq, void *devpw, struct pt_regs *regs)
                if (chan->load_state == S3C2410_DMALOAD_NONE) {
                        pr_debug("dma%d: end of transfer, stopping channel (%ld)\n",
                                 chan->number, jiffies);
-                        s3c2410_dma_ctrl(chan->number, S3C2410_DMAOP_STOP);
+                        s3c2410_dma_ctrl(chan->number | DMACH_LOW_LEVEL,
+                                         S3C2410_DMAOP_STOP);
                }
        }
@@ -726,37 +723,34 @@ s3c2410_dma_irq(int irq, void *devpw, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
+static struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel);
 /* s3c2410_request_dma
 *
 * get control of an dma channel
 */
-int s3c2410_dma_request(unsigned int channel, struct s3c2410_dma_client *client,
+int s3c2410_dma_request(unsigned int channel,
+                        struct s3c2410_dma_client *client,
                        void *dev)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan;
        unsigned long flags;
        int err;
        pr_debug("dma%d: s3c2410_request_dma: client=%s, dev=%p\n",
                 channel, client->name, dev);
-        check_channel(channel);
        local_irq_save(flags);
-        dbg_showchan(chan);
+        chan = s3c2410_dma_map_channel(channel);
+        if (chan == NULL) {
-        if (chan->in_use) {
+                local_irq_restore(flags);
-                if (client != chan->client) {
+                return -EBUSY;
-                        printk(KERN_ERR "dma%d: already in use\n", channel);
-                        local_irq_restore(flags);
-                        return -EBUSY;
-                } else {
-                        printk(KERN_ERR "dma%d: client already has channel\n", channel);
-                }
        }
+        dbg_showchan(chan);
        chan->client = client;
        chan->in_use = 1;
@@ -809,14 +803,14 @@ EXPORT_SYMBOL(s3c2410_dma_request);
 int s3c2410_dma_free(dmach_t channel, struct s3c2410_dma_client *client)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
        unsigned long flags;
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        local_irq_save(flags);
        if (chan->client != client) {
                printk(KERN_WARNING "dma%d: possible free from different client (channel %p, passed %p)\n",
                       channel, chan->client, client);
@@ -837,8 +831,12 @@ int s3c2410_dma_free(dmach_t channel, struct s3c2410_dma_client *client)
        if (chan->irq_claimed)
                free_irq(chan->irq, (void *)chan);
        chan->irq_claimed = 0;
+        if (!(channel & DMACH_LOW_LEVEL))
+                dma_chan_map[channel] = NULL;
        local_irq_restore(flags);
        return 0;
@@ -848,8 +846,8 @@ EXPORT_SYMBOL(s3c2410_dma_free);
 static int s3c2410_dma_dostop(struct s3c2410_dma_chan *chan)
 {
-        unsigned long tmp;
        unsigned long flags;
+        unsigned long tmp;
        pr_debug("%s:\n", __FUNCTION__);
@@ -997,9 +995,10 @@ s3c2410_dma_started(struct s3c2410_dma_chan *chan)
 int
 s3c2410_dma_ctrl(dmach_t channel, enum s3c2410_chan_op op)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        switch (op) {
        case S3C2410_DMAOP_START:
@@ -1046,12 +1045,19 @@ int s3c2410_dma_config(dmach_t channel,
                       int xferunit,
                       int dcon)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
        pr_debug("%s: chan=%d, xfer_unit=%d, dcon=%08x\n",
                 __FUNCTION__, channel, xferunit, dcon);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
+        printk("Initial dcon is %08x\n", dcon);
+        dcon |= chan->dcon & dma_sel.dcon_mask;
+        printk("New dcon is %08x\n", dcon);
        switch (xferunit) {
        case 1:
@@ -1086,9 +1092,10 @@ EXPORT_SYMBOL(s3c2410_dma_config);
 int s3c2410_dma_setflags(dmach_t channel, unsigned int flags)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        pr_debug("%s: chan=%p, flags=%08x\n", __FUNCTION__, chan, flags);
@@ -1106,9 +1113,10 @@ EXPORT_SYMBOL(s3c2410_dma_setflags);
 int s3c2410_dma_set_opfn(dmach_t channel, s3c2410_dma_opfn_t rtn)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        pr_debug("%s: chan=%p, op rtn=%p\n", __FUNCTION__, chan, rtn);
@@ -1121,9 +1129,10 @@ EXPORT_SYMBOL(s3c2410_dma_set_opfn);
 int s3c2410_dma_set_buffdone_fn(dmach_t channel, s3c2410_dma_cbfn_t rtn)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        pr_debug("%s: chan=%p, callback rtn=%p\n", __FUNCTION__, chan, rtn);
@@ -1153,9 +1162,10 @@ int s3c2410_dma_devconfig(int channel,
                          int hwcfg,
                          unsigned long devaddr)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        pr_debug("%s: source=%d, hwcfg=%08x, devaddr=%08lx\n",
                 __FUNCTION__, (int)source, hwcfg, devaddr);
@@ -1200,9 +1210,10 @@ EXPORT_SYMBOL(s3c2410_dma_devconfig);
 int s3c2410_dma_getposition(dmach_t channel, dma_addr_t *src, dma_addr_t *dst)
 {
-        struct s3c2410_dma_chan *chan = &s3c2410_chans[channel];
+        struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
-        check_channel(channel);
+        if (chan == NULL)
+                return -EINVAL;
        if (src != NULL)
                *src = dma_rdreg(chan, S3C2410_DMA_DCSRC);
@@ -1252,7 +1263,7 @@ static int s3c2410_dma_resume(struct sys_device *dev)
 #define s3c2410_dma_resume  NULL
 #endif /* CONFIG_PM */
-static struct sysdev_class dma_sysclass = {
+struct sysdev_class dma_sysclass = {
        set_kset_name("s3c24xx-dma"),
        .suspend        = s3c2410_dma_suspend,
        .resume         = s3c2410_dma_resume,
@@ -1265,7 +1276,6 @@ static void s3c2410_dma_cache_ctor(void *p, kmem_cache_t *c, unsigned long f)
        memset(p, 0, sizeof(struct s3c2410_dma_buf));
 }
 /* initialisation code */
 static int __init s3c2410_init_dma(void)
@@ -1274,7 +1284,7 @@ static int __init s3c2410_init_dma(void)
        int channel;
        int ret;
-        printk("S3C2410 DMA Driver, (c) 2003-2004 Simtec Electronics\n");
+        printk("S3C24XX DMA Driver, (c) 2003-2004,2006 Simtec Electronics\n");
        dma_base = ioremap(S3C24XX_PA_DMA, 0x200);
        if (dma_base == NULL) {
@@ -1282,6 +1292,8 @@ static int __init s3c2410_init_dma(void)
                return -ENOMEM;
        }
+        printk("Registering sysclass\n");
        ret = sysdev_class_register(&dma_sysclass);
        if (ret != 0) {
                printk(KERN_ERR "dma sysclass registration failed\n");
@@ -1335,4 +1347,95 @@ static int __init s3c2410_init_dma(void)
        return ret;
 }
-__initcall(s3c2410_init_dma);
+core_initcall(s3c2410_init_dma);
+static inline int is_channel_valid(unsigned int channel)
+{
+        return (channel & DMA_CH_VALID);
+}
+/* s3c2410_dma_map_channel()
+ *
+ * turn the virtual channel number into a real, and un-used hardware
+ * channel.
+ *
+ * currently this code uses first-free channel from the specified harware
+ * map, not taking into account anything that the board setup code may
+ * have to say about the likely peripheral set to be in use.
+*/
+struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel)
+{
+        struct s3c24xx_dma_map *ch_map;
+        struct s3c2410_dma_chan *dmach;
+        int ch;
+        if (dma_sel.map == NULL || channel > dma_sel.map_size)
+                return NULL;
+        ch_map = dma_sel.map + channel;
+        for (ch = 0; ch < S3C2410_DMA_CHANNELS; ch++) {
+                if (!is_channel_valid(ch_map->channels[ch]))
+                        continue;
+                if (s3c2410_chans[ch].in_use == 0) {
+                        printk("mapped channel %d to %d\n", channel, ch);
+                        break;
+                }
+        }
+        if (ch >= S3C2410_DMA_CHANNELS)
+                return NULL;
+        /* update our channel mapping */
+        dmach = &s3c2410_chans[ch];
+        dma_chan_map[channel] = dmach;
+        /* select the channel */
+        (dma_sel.select)(dmach, ch_map);
+        return dmach;
+}
+static void s3c24xx_dma_show_ch(struct s3c24xx_dma_map *map, int ch)
+{
+        /* show the channel configuration */
+        printk("%2d: %20s, channels %c%c%c%c\n", ch, map->name,
+               (is_channel_valid(map->channels[0]) ? '0' : '-'),
+               (is_channel_valid(map->channels[1]) ? '1' : '-'),
+               (is_channel_valid(map->channels[2]) ? '2' : '-'),
+               (is_channel_valid(map->channels[3]) ? '3' : '-'));
+}
+static int s3c24xx_dma_check_entry(struct s3c24xx_dma_map *map, int ch)
+{
+        if (1)
+                s3c24xx_dma_show_ch(map, ch);
+        return 0;
+}
+int __init s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel)
+{
+        struct s3c24xx_dma_map *nmap;
+        size_t map_sz = sizeof(*nmap) * sel->map_size;
+        int ptr;
+        nmap = kmalloc(map_sz, GFP_KERNEL);
+        if (nmap == NULL)
+                return -ENOMEM;
+        memcpy(nmap, sel->map, map_sz);
+        memcpy(&dma_sel, sel, sizeof(*sel));
+        dma_sel.map = nmap;
+        for (ptr = 0; ptr < sel->map_size; ptr++)
+                s3c24xx_dma_check_entry(nmap+ptr, ptr);
+        return 0;
+}
diff --git a/arch/arm/mach-s3c2410/dma.h b/arch/arm/mach-s3c2410/dma.h
new file mode 100644
index 000000000000..0ebfe0aab80b
--- /dev/null
+++ b/arch/arm/mach-s3c2410/dma.h
@@ -0,0 +1,45 @@
+/* arch/arm/mach-s3c2410/dma.h
+ *
+ * Copyright (C) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * Samsung S3C24XX DMA support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+extern struct sysdev_class dma_sysclass;
+extern struct s3c2410_dma_chan s3c2410_chans[S3C2410_DMA_CHANNELS];
+#define DMA_CH_VALID            (1<<31)
+struct s3c24xx_dma_addr {
+        unsigned long           from;
+        unsigned long           to;
+};
+/* struct s3c24xx_dma_map
+ *
+ * this holds the mapping information for the channel selected
+ * to be connected to the specified device
+*/
+struct s3c24xx_dma_map {
+        const char              *name;
+        struct s3c24xx_dma_addr  hw_addr;
+        unsigned long            channels[S3C2410_DMA_CHANNELS];
+};
+struct s3c24xx_dma_selection {
+        struct s3c24xx_dma_map  *map;
+        unsigned long            map_size;
+        unsigned long            dcon_mask;
+        void    (*select)(struct s3c2410_dma_chan *chan,
+                          struct s3c24xx_dma_map *map);
+};
+extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel);
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c
index cd39e8684584..db6393c99860 100644
--- a/arch/arm/mach-s3c2410/gpio.c
+++ b/arch/arm/mach-s3c2410/gpio.c
@@ -18,21 +18,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+*/
- * Changelog
- *      13-Sep-2004  BJD  Implemented change of MISCCR
- *      14-Sep-2004  BJD  Added getpin call
- *      14-Sep-2004  BJD  Fixed bug in setpin() call
- *      30-Sep-2004  BJD  Fixed cfgpin() mask bug
- *      01-Oct-2004  BJD  Added getcfg() to get pin configuration
- *      01-Oct-2004  BJD  Fixed mask bug in pullup() call
- *      01-Oct-2004  BJD  Added getirq() to turn pin into irqno
- *      04-Oct-2004  BJD  Added irq filter controls for GPIO
- *      05-Nov-2004  BJD  EXPORT_SYMBOL() added for all code
- *      13-Mar-2005  BJD  Updates for __iomem
- *      26-Oct-2005  BJD  Added generic configuration types
- *      15-Jan-2006  LCVR Added support for the S3C2400
- */
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index cd6139b35999..3e9f3462c61b 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -181,17 +181,19 @@ s3c_irq_unmask(unsigned int irqno)
 }
 struct irqchip s3c_irq_level_chip = {
-        .ack       = s3c_irq_maskack,
+        .name           = "s3c-level",
-        .mask      = s3c_irq_mask,
+        .ack            = s3c_irq_maskack,
-        .unmask    = s3c_irq_unmask,
+        .mask           = s3c_irq_mask,
-        .set_wake          = s3c_irq_wake
+        .unmask         = s3c_irq_unmask,
+        .set_wake       = s3c_irq_wake
 };
 static struct irqchip s3c_irq_chip = {
-        .ack       = s3c_irq_ack,
+        .name           = "s3c",
-        .mask      = s3c_irq_mask,
+        .ack            = s3c_irq_ack,
-        .unmask    = s3c_irq_unmask,
+        .mask           = s3c_irq_mask,
-        .set_wake  = s3c_irq_wake
+        .unmask         = s3c_irq_unmask,
+        .set_wake       = s3c_irq_wake
 };
 static void
@@ -343,19 +345,21 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
 }
 static struct irqchip s3c_irqext_chip = {
-        .mask       = s3c_irqext_mask,
+        .name           = "s3c-ext",
-        .unmask     = s3c_irqext_unmask,
+        .mask           = s3c_irqext_mask,
-        .ack        = s3c_irqext_ack,
+        .unmask         = s3c_irqext_unmask,
-        .set_type    = s3c_irqext_type,
+        .ack            = s3c_irqext_ack,
-        .set_wake    = s3c_irqext_wake
+        .set_type       = s3c_irqext_type,
+        .set_wake       = s3c_irqext_wake
 };
 static struct irqchip s3c_irq_eint0t4 = {
-        .ack       = s3c_irq_ack,
+        .name           = "s3c-ext0",
-        .mask      = s3c_irq_mask,
+        .ack            = s3c_irq_ack,
-        .unmask    = s3c_irq_unmask,
+        .mask           = s3c_irq_mask,
-        .set_wake  = s3c_irq_wake,
+        .unmask         = s3c_irq_unmask,
-        .set_type  = s3c_irqext_type,
+        .set_wake       = s3c_irq_wake,
+        .set_type       = s3c_irqext_type,
 };
 /* mask values for the parent registers for each of the interrupt types */
@@ -387,9 +391,10 @@ s3c_irq_uart0_ack(unsigned int irqno)
 }
 static struct irqchip s3c_irq_uart0 = {
-        .mask       = s3c_irq_uart0_mask,
+        .name           = "s3c-uart0",
-        .unmask     = s3c_irq_uart0_unmask,
+        .mask           = s3c_irq_uart0_mask,
-        .ack        = s3c_irq_uart0_ack,
+        .unmask         = s3c_irq_uart0_unmask,
+        .ack            = s3c_irq_uart0_ack,
 };
 /* UART1 */
@@ -413,9 +418,10 @@ s3c_irq_uart1_ack(unsigned int irqno)
 }
 static struct irqchip s3c_irq_uart1 = {
-        .mask       = s3c_irq_uart1_mask,
+        .name           = "s3c-uart1",
-        .unmask     = s3c_irq_uart1_unmask,
+        .mask           = s3c_irq_uart1_mask,
-        .ack        = s3c_irq_uart1_ack,
+        .unmask         = s3c_irq_uart1_unmask,
+        .ack            = s3c_irq_uart1_ack,
 };
 /* UART2 */
@@ -439,9 +445,10 @@ s3c_irq_uart2_ack(unsigned int irqno)
 }
 static struct irqchip s3c_irq_uart2 = {
-        .mask       = s3c_irq_uart2_mask,
+        .name           = "s3c-uart2",
-        .unmask     = s3c_irq_uart2_unmask,
+        .mask           = s3c_irq_uart2_mask,
-        .ack        = s3c_irq_uart2_ack,
+        .unmask         = s3c_irq_uart2_unmask,
+        .ack            = s3c_irq_uart2_ack,
 };
 /* ADC and Touchscreen */
@@ -465,9 +472,10 @@ s3c_irq_adc_ack(unsigned int irqno)
 }
 static struct irqchip s3c_irq_adc = {
-        .mask       = s3c_irq_adc_mask,
+        .name           = "s3c-adc",
-        .unmask     = s3c_irq_adc_unmask,
+        .mask           = s3c_irq_adc_mask,
-        .ack        = s3c_irq_adc_ack,
+        .unmask         = s3c_irq_adc_unmask,
+        .ack            = s3c_irq_adc_ack,
 };
 /* irq demux for adc */
@@ -569,23 +577,104 @@ s3c_irq_demux_uart2(unsigned int irq,
 }
 static void
-s3c_irq_demux_extint(unsigned int irq,
+s3c_irq_demux_extint8(unsigned int irq,
-                     struct irqdesc *desc,
+                      struct irqdesc *desc,
-                     struct pt_regs *regs)
+                      struct pt_regs *regs)
 {
        unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
        unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
        eintpnd &= ~eintmsk;
+        eintpnd &= ~0xff;       /* ignore lower irqs */
-        if (eintpnd) {
+        /* we may as well handle all the pending IRQs here */
-                irq = fls(eintpnd);
-                irq += (IRQ_EINT4 - (4 + 1));
+        while (eintpnd) {
+                irq = __ffs(eintpnd);
+                eintpnd &= ~(1<<irq);
+                irq += (IRQ_EINT4 - 4);
                desc_handle_irq(irq, irq_desc + irq, regs);
        }
+}
+static void
+s3c_irq_demux_extint4t7(unsigned int irq,
+                        struct irqdesc *desc,
+                        struct pt_regs *regs)
+{
+        unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
+        unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
+        eintpnd &= ~eintmsk;
+        eintpnd &= 0xff;        /* only lower irqs */
+        /* we may as well handle all the pending IRQs here */
+        while (eintpnd) {
+                irq = __ffs(eintpnd);
+                eintpnd &= ~(1<<irq);
+                irq += (IRQ_EINT4 - 4);
+                desc_handle_irq(irq, irq_desc + irq, regs);
+        }
+}
+#ifdef CONFIG_PM
+static struct sleep_save irq_save[] = {
+        SAVE_ITEM(S3C2410_INTMSK),
+        SAVE_ITEM(S3C2410_INTSUBMSK),
+};
+/* the extint values move between the s3c2410/s3c2440 and the s3c2412
+ * so we use an array to hold them, and to calculate the address of
+ * the register at run-time
+*/
+static unsigned long save_extint[3];
+static unsigned long save_eintflt[4];
+static unsigned long save_eintmask;
+int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+{
+        unsigned int i;
+        for (i = 0; i < ARRAY_SIZE(save_extint); i++)
+                save_extint[i] = __raw_readl(S3C24XX_EXTINT0 + (i*4));
+        for (i = 0; i < ARRAY_SIZE(save_eintflt); i++)
+                save_eintflt[i] = __raw_readl(S3C24XX_EINFLT0 + (i*4));
+        s3c2410_pm_do_save(irq_save, ARRAY_SIZE(irq_save));
+        save_eintmask = __raw_readl(S3C24XX_EINTMASK);
+        return 0;
 }
+int s3c24xx_irq_resume(struct sys_device *dev)
+{
+        unsigned int i;
+        for (i = 0; i < ARRAY_SIZE(save_extint); i++)
+                __raw_writel(save_extint[i], S3C24XX_EXTINT0 + (i*4));
+        for (i = 0; i < ARRAY_SIZE(save_eintflt); i++)
+                __raw_writel(save_eintflt[i], S3C24XX_EINFLT0 + (i*4));
+        s3c2410_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
+        __raw_writel(save_eintmask, S3C24XX_EINTMASK);
+        return 0;
+}
+#else
+#define s3c24xx_irq_suspend NULL
+#define s3c24xx_irq_resume  NULL
+#endif
 /* s3c24xx_init_irq
 *
 * Initialise S3C2410 IRQ system
@@ -674,8 +763,8 @@ void __init s3c24xx_init_irq(void)
        /* setup the cascade irq handlers */
-        set_irq_chained_handler(IRQ_EINT4t7, s3c_irq_demux_extint);
+        set_irq_chained_handler(IRQ_EINT4t7, s3c_irq_demux_extint4t7);
-        set_irq_chained_handler(IRQ_EINT8t23, s3c_irq_demux_extint);
+        set_irq_chained_handler(IRQ_EINT8t23, s3c_irq_demux_extint8);
        set_irq_chained_handler(IRQ_UART0, s3c_irq_demux_uart0);
        set_irq_chained_handler(IRQ_UART1, s3c_irq_demux_uart1);
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
new file mode 100644
index 000000000000..ba5109af40b4
--- /dev/null
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -0,0 +1,266 @@
+/***********************************************************************
+ *
+ * linux/arch/arm/mach-s3c2410/mach-amlm5900.c
+ *
+ * Copyright (c) 2006 American Microsystems Limited
+ *      David Anders <danders@amltd.com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * @History:
+ * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ ***********************************************************************/
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/proc_fs.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/arch/fb.h>
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-gpio.h>
+#include "devs.h"
+#include "cpu.h"
+#ifdef CONFIG_MTD_PARTITIONS
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/physmap.h>
+static struct resource amlm5900_nor_resource = {
+                .start = 0x00000000,
+                .end   = 0x01000000 - 1,
+                .flags = IORESOURCE_MEM,
+};
+static struct mtd_partition amlm5900_mtd_partitions[] = {
+        {
+                .name           = "System",
+                .size           = 0x240000,
+                .offset         = 0,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name           = "Kernel",
+                .size           = 0x100000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "Ramdisk",
+                .size           = 0x300000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "JFFS2",
+                .size           = 0x9A0000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "Settings",
+                .size           = MTDPART_SIZ_FULL,
+                .offset         = MTDPART_OFS_APPEND,
+        }
+};
+static struct physmap_flash_data amlm5900_flash_data = {
+        .width          = 2,
+        .parts          = amlm5900_mtd_partitions,
+        .nr_parts       = ARRAY_SIZE(amlm5900_mtd_partitions),
+};
+static struct platform_device amlm5900_device_nor = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev = {
+                        .platform_data = &amlm5900_flash_data,
+                },
+        .num_resources  = 1,
+        .resource       = &amlm5900_nor_resource,
+};
+#endif
+static struct map_desc amlm5900_iodesc[] __initdata = {
+        {
+                .virtual        = (u32)S3C24XX_VA_SPI,
+                .pfn            = __phys_to_pfn(S3C2410_PA_SPI),
+                .length         = SZ_1M,
+                .type           = MT_DEVICE
+        }
+};
+#define UCON S3C2410_UCON_DEFAULT
+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+static struct s3c2410_uartcfg amlm5900_uartcfgs[] = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [1] = {
+                .hwport      = 1,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        }
+};
+static struct platform_device *amlm5900_devices[] __initdata = {
+#ifdef CONFIG_FB_S3C2410
+        &s3c_device_lcd,
+#endif
+        &s3c_device_adc,
+        &s3c_device_wdt,
+        &s3c_device_i2c,
+        &s3c_device_usb,
+        &s3c_device_rtc,
+        &s3c_device_usbgadget,
+        &s3c_device_sdi,
+#ifdef CONFIG_MTD_PARTITIONS
+        &amlm5900_device_nor,
+#endif
+};
+static struct s3c24xx_board amlm5900_board __initdata = {
+        .devices       = amlm5900_devices,
+        .devices_count = ARRAY_SIZE(amlm5900_devices)
+};
+void __init amlm5900_map_io(void)
+{
+        s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));
+        s3c24xx_init_clocks(0);
+        s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));
+        s3c24xx_set_board(&amlm5900_board);
+}
+#ifdef CONFIG_FB_S3C2410
+static struct s3c2410fb_mach_info __initdata amlm5900_lcd_info = {
+        .width          = 160,
+        .height         = 160,
+/* commented out until stn patch is submitted
+*       .type           = S3C2410_LCDCON1_STN4,
+*/
+        .gpccon =       0xaaaaaaaa,
+        .gpccon_mask =  0xffffffff,
+        .gpcup =        0x0000ffff,
+        .gpcup_mask =   0xffffffff,
+        .gpdcon =       0xaaaaaaaa,
+        .gpdcon_mask =  0xffffffff,
+        .gpdup =        0x0000ffff,
+        .gpdup_mask =   0xffffffff,
+        .xres           = {
+                .min            = 160,
+                .max            = 160,
+                .defval         = 160,
+        },
+        .yres           = {
+                .min            = 160,
+                .max            = 160,
+                .defval         = 160,
+        },
+        .bpp            = {
+                .min            = 4,
+                .max            = 4,
+                .defval         = 4,
+        },
+        .regs           = {
+                .lcdcon1        = 0x00008225,
+                .lcdcon2        = 0x0027c000,
+                .lcdcon3        = 0x00182708,
+                .lcdcon4        = 0x00000002,
+                .lcdcon5        = 0x00000001,
+        }
+};
+#endif
+static irqreturn_t
+amlm5900_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)
+{
+        return IRQ_HANDLED;
+}
+static void amlm5900_init_pm(void)
+{
+        int ret = 0;
+        ret = request_irq(IRQ_EINT9, &amlm5900_wake_interrupt,
+                                IRQF_TRIGGER_RISING | IRQF_SHARED,
+                                "amlm5900_wakeup", &amlm5900_wake_interrupt);
+        if (ret != 0) {
+                printk(KERN_ERR "AML-M5900: no wakeup irq, %d?\n", ret);
+        } else {
+                enable_irq_wake(IRQ_EINT9);
+                /* configure the suspend/resume status pin */
+                s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP);
+                s3c2410_gpio_pullup(S3C2410_GPF2, 0);
+        }
+}
+static void __init amlm5900_init(void)
+{
+        amlm5900_init_pm();
+#ifdef CONFIG_FB_S3C2410
+        s3c24xx_fb_set_platdata(&amlm5900_lcd_info);
+#endif
+}
+MACHINE_START(AML_M5900, "AML_M5900")
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = amlm5900_map_io,
+        .init_irq       = s3c24xx_init_irq,
+        .init_machine   = amlm5900_init,
+        .timer          = &s3c24xx_timer,
+MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-anubis.c b/arch/arm/mach-s3c2410/mach-anubis.c
index 60641d452db3..e94cdcd96591 100644
--- a/arch/arm/mach-s3c2410/mach-anubis.c
+++ b/arch/arm/mach-s3c2410/mach-anubis.c
@@ -4,15 +4,9 @@
 *      http://armlinux.simtec.co.uk/
 *      Ben Dooks <ben@simtec.co.uk>
 *
- *
- *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *      02-May-2005 BJD  Copied from mach-bast.c
- *      20-Sep-2005 BJD  Added static to non-exported items
 */
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index d661c6b7ff56..e2205ff1b0ee 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -11,15 +11,6 @@
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
- * Modifications:
- *      01-Nov-2004 BJD   Initial version
- *      12-Nov-2004 BJD   Updated for release
- *      04-Jan-2005 BJD   Fixes for pre-release
- *      22-Feb-2005 BJD   Updated for 2.6.11-rc5 relesa
- *      10-Mar-2005 LCVR  Replaced S3C2410_VA by S3C24XX_VA
- *      14-Mar-2005 BJD   void __iomem fixes
- *      20-Sep-2005 BJD   Added static to non-exported items
- *      26-Oct-2005 BJD   Added framebuffer data
 */
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-s3c2410/mach-vstms.c b/arch/arm/mach-s3c2410/mach-vstms.c
new file mode 100644
index 000000000000..ea554e7c006e
--- /dev/null
+++ b/arch/arm/mach-s3c2410/mach-vstms.c
@@ -0,0 +1,168 @@
+/* linux/arch/arm/mach-s3c2410/mach-vstms.c
+ *
+ * (C) 2006 Thomas Gleixner <tglx@linutronix.de>
+ *
+ * Derived from mach-smdk2413.c - (C) 2006 Simtec Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/hardware.h>
+#include <asm/hardware/iomd.h>
+#include <asm/setup.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/idle.h>
+#include <asm/arch/fb.h>
+#include <asm/arch/nand.h>
+#include "s3c2410.h"
+#include "s3c2412.h"
+#include "clock.h"
+#include "devs.h"
+#include "cpu.h"
+static struct map_desc vstms_iodesc[] __initdata = {
+};
+static struct s3c2410_uartcfg vstms_uartcfgs[] __initdata = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = 0x3c5,
+                .ulcon       = 0x03,
+                .ufcon       = 0x51,
+        },
+        [1] = {
+                .hwport      = 1,
+                .flags       = 0,
+                .ucon        = 0x3c5,
+                .ulcon       = 0x03,
+                .ufcon       = 0x51,
+        },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = 0x3c5,
+                .ulcon       = 0x03,
+                .ufcon       = 0x51,
+        }
+};
+static struct mtd_partition vstms_nand_part[] = {
+        [0] = {
+                .name   = "Boot Agent",
+                .size   = 0x7C000,
+                .offset = 0,
+        },
+        [1] = {
+                .name   = "UBoot Config",
+                .offset = 0x7C000,
+                .size   = 0x4000,
+        },
+        [2] = {
+                .name   = "Kernel",
+                .offset = 0x80000,
+                .size   = 0x200000,
+        },
+        [3] = {
+                .name   = "RFS",
+                .offset = 0x280000,
+                .size   = 0x3d80000,
+        },
+};
+static struct s3c2410_nand_set vstms_nand_sets[] = {
+        [0] = {
+                .name           = "NAND",
+                .nr_chips       = 1,
+                .nr_partitions  = ARRAY_SIZE(vstms_nand_part),
+                .partitions     = vstms_nand_part,
+        },
+};
+/* choose a set of timings which should suit most 512Mbit
+ * chips and beyond.
+*/
+static struct s3c2410_platform_nand vstms_nand_info = {
+        .tacls          = 20,
+        .twrph0         = 60,
+        .twrph1         = 20,
+        .nr_sets        = ARRAY_SIZE(vstms_nand_sets),
+        .sets           = vstms_nand_sets,
+};
+static struct platform_device *vstms_devices[] __initdata = {
+        &s3c_device_usb,
+        &s3c_device_wdt,
+        &s3c_device_i2c,
+        &s3c_device_iis,
+        &s3c_device_rtc,
+        &s3c_device_nand,
+};
+static struct s3c24xx_board vstms_board __initdata = {
+        .devices       = vstms_devices,
+        .devices_count = ARRAY_SIZE(vstms_devices)
+};
+static void __init vstms_fixup(struct machine_desc *desc,
+                                  struct tag *tags, char **cmdline,
+                                  struct meminfo *mi)
+{
+        if (tags != phys_to_virt(S3C2410_SDRAM_PA + 0x100)) {
+                mi->nr_banks=1;
+                mi->bank[0].start = 0x30000000;
+                mi->bank[0].size = SZ_64M;
+                mi->bank[0].node = 0;
+        }
+}
+static void __init vstms_map_io(void)
+{
+        s3c_device_nand.dev.platform_data = &vstms_nand_info;
+        s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc));
+        s3c24xx_init_clocks(12000000);
+        s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs));
+        s3c24xx_set_board(&vstms_board);
+}
+MACHINE_START(VSTMS, "VSTMS")
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .fixup          = vstms_fixup,
+        .init_irq       = s3c24xx_init_irq,
+        .map_io         = vstms_map_io,
+        .timer          = &s3c24xx_timer,
+MACHINE_END
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
index 7b244566a436..42cd05e298f8 100644
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -49,7 +49,8 @@ static __init int pm_simtec_init(void)
        /* check which machine we are running on */
        if (!machine_is_bast() && !machine_is_vr1000() &&
-            !machine_is_anubis() && !machine_is_osiris())
+            !machine_is_anubis() && !machine_is_osiris() &&
+            !machine_is_aml_m5900())
                return 0;
        printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index a589fe76d915..b49a0b3b72b3 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -1,9 +1,9 @@
 /* linux/arch/arm/mach-s3c2410/pm.c
 *
- * Copyright (c) 2004 Simtec Electronics
+ * Copyright (c) 2004,2006 Simtec Electronics
 *      Ben Dooks <ben@simtec.co.uk>
 *
- * S3C2410 Power Manager (Suspend-To-RAM) support
+ * S3C24XX Power Manager (Suspend-To-RAM) support
 *
 * See Documentation/arm/Samsung-S3C24XX/Suspend.txt for more information
 *
@@ -24,9 +24,6 @@
 * Parts based on arch/arm/mach-pxa/pm.c
 *
 * Thanks to Dimitry Andric for debugging
- *
- * Modifications:
- *     10-Mar-2005 LCVR  Changed S3C2410_VA_UART to S3C24XX_VA_UART
 */
 #include <linux/init.h>
@@ -38,6 +35,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
+#include <asm/cacheflush.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -55,14 +53,6 @@
 unsigned long s3c_pm_flags;
-/* cache functions from arch/arm/mm/proc-arm920.S */
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
-extern void arm920_flush_kern_cache_all(void);
-#else
-static void arm920_flush_kern_cache_all(void) { }
-#endif
 #define PFX "s3c24xx-pm: "
 static struct sleep_save core_save[] = {
@@ -92,19 +82,6 @@ static struct sleep_save core_save[] = {
        SAVE_ITEM(S3C2410_REFRESH),
 };
-/* this lot should be really saved by the IRQ code */
-static struct sleep_save irq_save[] = {
-        SAVE_ITEM(S3C2410_EXTINT0),
-        SAVE_ITEM(S3C2410_EXTINT1),
-        SAVE_ITEM(S3C2410_EXTINT2),
-        SAVE_ITEM(S3C2410_EINFLT0),
-        SAVE_ITEM(S3C2410_EINFLT1),
-        SAVE_ITEM(S3C2410_EINFLT2),
-        SAVE_ITEM(S3C2410_EINFLT3),
-        SAVE_ITEM(S3C2410_EINTMASK),
-        SAVE_ITEM(S3C2410_INTMSK)
-};
 static struct sleep_save gpio_save[] = {
        SAVE_ITEM(S3C2410_GPACON),
        SAVE_ITEM(S3C2410_GPADAT),
@@ -165,7 +142,7 @@ static struct sleep_save uart_save[] = {
 extern void printascii(const char *);
-static void pm_dbg(const char *fmt, ...)
+void pm_dbg(const char *fmt, ...)
 {
        va_list va;
        char buff[256];
@@ -509,6 +486,9 @@ static void s3c2410_pm_configure_extint(void)
        }
 }
+void (*pm_cpu_prep)(void);
+void (*pm_cpu_sleep)(void);
 #define any_allowed(mask, allow) (((mask) & (allow)) != (allow))
 /* s3c2410_pm_enter
@@ -519,7 +499,6 @@ static void s3c2410_pm_configure_extint(void)
 static int s3c2410_pm_enter(suspend_state_t state)
 {
        unsigned long regs_save[16];
-        unsigned long tmp;
        /* ensure the debug is initialised (if enabled) */
@@ -527,6 +506,11 @@ static int s3c2410_pm_enter(suspend_state_t state)
        DBG("s3c2410_pm_enter(%d)\n", state);
+        if (pm_cpu_prep == NULL || pm_cpu_sleep == NULL) {
+                printk(KERN_ERR PFX "error: no cpu sleep functions set\n");
+                return -EINVAL;
+        }
        if (state != PM_SUSPEND_MEM) {
                printk(KERN_ERR PFX "error: only PM_SUSPEND_MEM supported\n");
                return -EINVAL;
@@ -554,17 +538,9 @@ static int s3c2410_pm_enter(suspend_state_t state)
        DBG("s3c2410_sleep_save_phys=0x%08lx\n", s3c2410_sleep_save_phys);
-        /* ensure at least GESTATUS3 has the resume address */
-        __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2410_GSTATUS3);
-        DBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3));
-        DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));
        /* save all necessary core registers not covered by the drivers */
        s3c2410_pm_do_save(gpio_save, ARRAY_SIZE(gpio_save));
-        s3c2410_pm_do_save(irq_save, ARRAY_SIZE(irq_save));
        s3c2410_pm_do_save(core_save, ARRAY_SIZE(core_save));
        s3c2410_pm_do_save(uart_save, ARRAY_SIZE(uart_save));
@@ -581,10 +557,16 @@ static int s3c2410_pm_enter(suspend_state_t state)
        /* ack any outstanding external interrupts before we go to sleep */
        __raw_writel(__raw_readl(S3C2410_EINTPEND), S3C2410_EINTPEND);
+        __raw_writel(__raw_readl(S3C2410_INTPND), S3C2410_INTPND);
+        __raw_writel(__raw_readl(S3C2410_SRCPND), S3C2410_SRCPND);
+        /* call cpu specific preperation */
+        pm_cpu_prep();
        /* flush cache back to ram */
-        arm920_flush_kern_cache_all();
+        flush_cache_all();
        s3c2410_pm_check_store();
@@ -592,23 +574,23 @@ static int s3c2410_pm_enter(suspend_state_t state)
        __raw_writel(0x00, S3C2410_CLKCON);  /* turn off clocks over sleep */
-        s3c2410_cpu_suspend(regs_save);
+        /* s3c2410_cpu_save will also act as our return point from when
+         * we resume as it saves its own register state, so use the return
+         * code to differentiate return from save and return from sleep */
+        if (s3c2410_cpu_save(regs_save) == 0) {
+                flush_cache_all();
+                pm_cpu_sleep();
+        }
        /* restore the cpu state */
        cpu_init();
-        /* unset the return-from-sleep flag, to ensure reset */
-        tmp = __raw_readl(S3C2410_GSTATUS2);
-        tmp &= S3C2410_GSTATUS2_OFFRESET;
-        __raw_writel(tmp, S3C2410_GSTATUS2);
        /* restore the system state */
        s3c2410_pm_do_restore_core(core_save, ARRAY_SIZE(core_save));
        s3c2410_pm_do_restore(gpio_save, ARRAY_SIZE(gpio_save));
-        s3c2410_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
        s3c2410_pm_do_restore(uart_save, ARRAY_SIZE(uart_save));
        s3c2410_pm_debug_init();
diff --git a/arch/arm/mach-s3c2410/pm.h b/arch/arm/mach-s3c2410/pm.h
index 7a5e714c7386..ffe197a119fb 100644
--- a/arch/arm/mach-s3c2410/pm.h
+++ b/arch/arm/mach-s3c2410/pm.h
@@ -34,13 +34,19 @@ extern unsigned long s3c_irqwake_eintmask;
 extern unsigned long s3c_irqwake_intallow;
 extern unsigned long s3c_irqwake_eintallow;
+/* per-cpu sleep functions */
+extern void (*pm_cpu_prep)(void);
+extern void (*pm_cpu_sleep)(void);
 /* Flags for PM Control */
 extern unsigned long s3c_pm_flags;
 /* from sleep.S */
-extern void s3c2410_cpu_suspend(unsigned long *saveblk);
+extern int  s3c2410_cpu_save(unsigned long *saveblk);
+extern void s3c2410_cpu_suspend(void);
 extern void s3c2410_cpu_resume(void);
 extern unsigned long s3c2410_sleep_save_phys;
@@ -57,3 +63,11 @@ struct sleep_save {
 extern void s3c2410_pm_do_save(struct sleep_save *ptr, int count);
 extern void s3c2410_pm_do_restore(struct sleep_save *ptr, int count);
+#ifdef CONFIG_PM
+extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state);
+extern int s3c24xx_irq_resume(struct sys_device *dev);
+#else
+#define s3c24xx_irq_suspend NULL
+#define s3c24xx_irq_resume  NULL
+#endif
diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c b/arch/arm/mach-s3c2410/s3c2410-dma.c
new file mode 100644
index 000000000000..51e5098b32e8
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -0,0 +1,158 @@
+/* linux/arch/arm/mach-s3c2410/s3c2410-dma.c
+ *
+ * (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2410 DMA selection
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sysdev.h>
+#include <asm/dma.h>
+#include <asm/arch/dma.h>
+#include "dma.h"
+#include "cpu.h"
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-ac97.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-sdi.h>
+#include <asm/arch/regs-iis.h>
+#include <asm/arch/regs-spi.h>
+static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
+        [DMACH_XD0] = {
+                .name           = "xdreq0",
+                .channels[0]    = S3C2410_DCON_CH0_XDREQ0 | DMA_CH_VALID,
+        },
+        [DMACH_XD1] = {
+                .name           = "xdreq1",
+                .channels[1]    = S3C2410_DCON_CH1_XDREQ1 | DMA_CH_VALID,
+        },
+        [DMACH_SDI] = {
+                .name           = "sdi",
+                .channels[0]    = S3C2410_DCON_CH0_SDI | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_SDI | DMA_CH_VALID,
+                .channels[3]    = S3C2410_DCON_CH3_SDI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_SPI0] = {
+                .name           = "spi0",
+                .channels[1]    = S3C2410_DCON_CH1_SPI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_SPI + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + S3C2410_SPRDAT,
+        },
+        [DMACH_SPI1] = {
+                .name           = "spi1",
+                .channels[3]    = S3C2410_DCON_CH3_SPI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_SPI + 0x20 + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + 0x20 + S3C2410_SPRDAT,
+        },
+        [DMACH_UART0] = {
+                .name           = "uart0",
+                .channels[0]    = S3C2410_DCON_CH0_UART0 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART0 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART0 + S3C2410_URXH,
+        },
+        [DMACH_UART1] = {
+                .name           = "uart1",
+                .channels[1]    = S3C2410_DCON_CH1_UART1 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART1 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART1 + S3C2410_URXH,
+        },
+        [DMACH_UART2] = {
+                .name           = "uart2",
+                .channels[3]    = S3C2410_DCON_CH3_UART2 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART2 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART2 + S3C2410_URXH,
+        },
+        [DMACH_TIMER] = {
+                .name           = "timer",
+                .channels[0]    = S3C2410_DCON_CH0_TIMER | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_TIMER | DMA_CH_VALID,
+                .channels[3]    = S3C2410_DCON_CH3_TIMER | DMA_CH_VALID,
+        },
+        [DMACH_I2S_IN] = {
+                .name           = "i2s-sdi",
+                .channels[1]    = S3C2410_DCON_CH1_I2SSDI | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_I2SSDI | DMA_CH_VALID,
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_I2S_OUT] = {
+                .name           = "i2s-sdo",
+                .channels[2]    = S3C2410_DCON_CH2_I2SSDO | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_USB_EP1] = {
+                .name           = "usb-ep1",
+                .channels[0]    = S3C2410_DCON_CH0_USBEP1 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP2] = {
+                .name           = "usb-ep2",
+                .channels[1]    = S3C2410_DCON_CH1_USBEP2 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP3] = {
+                .name           = "usb-ep3",
+                .channels[2]    = S3C2410_DCON_CH2_USBEP3 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP4] = {
+                .name           = "usb-ep4",
+                .channels[3]    =S3C2410_DCON_CH3_USBEP4 | DMA_CH_VALID,
+        },
+};
+static void s3c2410_dma_select(struct s3c2410_dma_chan *chan,
+                               struct s3c24xx_dma_map *map)
+{
+        chan->dcon = map->channels[chan->number] & ~DMA_CH_VALID;
+}
+static struct s3c24xx_dma_selection __initdata s3c2410_dma_sel = {
+        .select         = s3c2410_dma_select,
+        .dcon_mask      = 7 << 24,
+        .map            = s3c2410_dma_mappings,
+        .map_size       = ARRAY_SIZE(s3c2410_dma_mappings),
+};
+static int s3c2410_dma_add(struct sys_device *sysdev)
+{
+        return s3c24xx_dma_init_map(&s3c2410_dma_sel);
+}
+static struct sysdev_driver s3c2410_dma_driver = {
+        .add    = s3c2410_dma_add,
+};
+static int __init s3c2410_dma_init(void)
+{
+        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_dma_driver);
+}
+arch_initcall(s3c2410_dma_init);
+/* S3C2442 DMA contains the same selection table as the S3C2410 */
+static struct sysdev_driver s3c2442_dma_driver = {
+        .add    = s3c2410_dma_add,
+};
+static int __init s3c2442_dma_init(void)
+{
+        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_dma_driver);
+}
+arch_initcall(s3c2442_dma_init);
diff --git a/arch/arm/mach-s3c2410/s3c2410-irq.c b/arch/arm/mach-s3c2410/s3c2410-irq.c
new file mode 100644
index 000000000000..c796c9c76e78
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2410-irq.c
@@ -0,0 +1,48 @@
+/* linux/arch/arm/mach-s3c2410/s3c2410-irq.c
+ *
+ * Copyright (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+*/
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/ptrace.h>
+#include <linux/sysdev.h>
+#include "cpu.h"
+#include "pm.h"
+static int s3c2410_irq_add(struct sys_device *sysdev)
+{
+        return 0;
+}
+static struct sysdev_driver s3c2410_irq_driver = {
+        .add            = s3c2410_irq_add,
+        .suspend        = s3c24xx_irq_suspend,
+        .resume         = s3c24xx_irq_resume,
+};
+static int s3c2410_irq_init(void)
+{
+        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_irq_driver);
+}
+arch_initcall(s3c2410_irq_init);
diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c b/arch/arm/mach-s3c2410/s3c2410-pm.c
new file mode 100644
index 000000000000..e51d76669512
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -0,0 +1,120 @@
+/* linux/arch/arm/mach-s3c2410/s3c2410-pm.c
+ *
+ * Copyright (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2410 (and compatible) Power Manager (Suspend-To-RAM) support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/errno.h>
+#include <linux/time.h>
+#include <linux/sysdev.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <asm/arch/regs-gpio.h>
+#include "cpu.h"
+#include "pm.h"
+#ifdef CONFIG_S3C2410_PM_DEBUG
+extern void pm_dbg(const char *fmt, ...);
+#define DBG(fmt...) pm_dbg(fmt)
+#else
+#define DBG(fmt...) printk(KERN_DEBUG fmt)
+#endif
+static void s3c2410_pm_prepare(void)
+{
+        /* ensure at least GSTATUS3 has the resume address */
+        __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2410_GSTATUS3);
+        DBG("GSTATUS3 0x%08x\n", __raw_readl(S3C2410_GSTATUS3));
+        DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));
+        if ( machine_is_aml_m5900() )
+                s3c2410_gpio_setpin(S3C2410_GPF2, 1);
+}
+int s3c2410_pm_resume(struct sys_device *dev)
+{
+        unsigned long tmp;
+        /* unset the return-from-sleep flag, to ensure reset */
+        tmp = __raw_readl(S3C2410_GSTATUS2);
+        tmp &= S3C2410_GSTATUS2_OFFRESET;
+        __raw_writel(tmp, S3C2410_GSTATUS2);
+        if ( machine_is_aml_m5900() )
+                s3c2410_gpio_setpin(S3C2410_GPF2, 0);
+        return 0;
+}
+static int s3c2410_pm_add(struct sys_device *dev)
+{
+        pm_cpu_prep = s3c2410_pm_prepare;
+        pm_cpu_sleep = s3c2410_cpu_suspend;
+        return 0;
+}
+static struct sysdev_driver s3c2410_pm_driver = {
+        .add            = s3c2410_pm_add,
+        .resume         = s3c2410_pm_resume,
+};
+/* register ourselves */
+static int __init s3c2410_pm_drvinit(void)
+{
+        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_pm_driver);
+}
+arch_initcall(s3c2410_pm_drvinit);
+static struct sysdev_driver s3c2440_pm_driver = {
+        .add            = s3c2410_pm_add,
+        .resume         = s3c2410_pm_resume,
+};
+static int __init s3c2440_pm_drvinit(void)
+{
+        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_pm_driver);
+}
+arch_initcall(s3c2440_pm_drvinit);
+static struct sysdev_driver s3c2442_pm_driver = {
+        .add            = s3c2410_pm_add,
+        .resume         = s3c2410_pm_resume,
+};
+static int __init s3c2442_pm_drvinit(void)
+{
+        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_pm_driver);
+}
+arch_initcall(s3c2442_pm_drvinit);
diff --git a/arch/arm/mach-s3c2410/s3c2410-sleep.S b/arch/arm/mach-s3c2410/s3c2410-sleep.S
new file mode 100644
index 000000000000..9179a1024588
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2410-sleep.S
@@ -0,0 +1,68 @@
+/* linux/arch/arm/mach-s3c2410/s3c2410-sleep.S
+ *
+ * Copyright (c) 2004 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2410 Power Manager (Suspend-To-RAM) support
+ *
+ * Based on PXA/SA1100 sleep code by:
+ *      Nicolas Pitre, (c) 2002 Monta Vista Software Inc
+ *      Cliff Brake, (c) 2001
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/hardware.h>
+#include <asm/arch/map.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-clock.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-serial.h>
+        /* s3c2410_cpu_suspend
+         *
+         * put the cpu into sleep mode
+        */
+ENTRY(s3c2410_cpu_suspend)
+        @@ prepare cpu to sleep
+        ldr     r4, =S3C2410_REFRESH
+        ldr     r5, =S3C24XX_MISCCR
+        ldr     r6, =S3C2410_CLKCON
+        ldr     r7, [ r4 ]              @ get REFRESH (and ensure in TLB)
+        ldr     r8, [ r5 ]              @ get MISCCR (and ensure in TLB)
+        ldr     r9, [ r6 ]              @ get CLKCON (and ensure in TLB)
+        orr     r7, r7, #S3C2410_REFRESH_SELF   @ SDRAM sleep command
+        orr     r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
+        orr     r9, r9, #S3C2410_CLKCON_POWER   @ power down command
+        teq     pc, #0                  @ first as a trial-run to load cache
+        bl      s3c2410_do_sleep
+        teq     r0, r0                  @ now do it for real
+        b       s3c2410_do_sleep        @
+        @@ align next bit of code to cache line
+        .align  8
+s3c2410_do_sleep:
+        streq   r7, [ r4 ]                      @ SDRAM sleep command
+        streq   r8, [ r5 ]                      @ SDRAM power-down config
+        streq   r9, [ r6 ]                      @ CPU sleep
+1:      beq     1b
+        mov     pc, r14
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index a110cff9cf6b..183e4033ce61 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -8,17 +8,6 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *     16-May-2003 BJD  Created initial version
- *     16-Aug-2003 BJD  Fixed header files and copyright, added URL
- *     05-Sep-2003 BJD  Moved to kernel v2.6
- *     18-Jan-2004 BJD  Added serial port configuration
- *     21-Aug-2004 BJD  Added new struct s3c2410_board handler
- *     28-Sep-2004 BJD  Updates for new serial port bits
- *     04-Nov-2004 BJD  Updated UART configuration process
- *     10-Jan-2005 BJD  Removed s3c2410_clock_tick_rate
- *     13-Aug-2005 DA   Removed UART from initial I/O mappings
 */
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-s3c2410/s3c2412-dma.c b/arch/arm/mach-s3c2410/s3c2412-dma.c
new file mode 100644
index 000000000000..171f3706d36d
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2412-dma.c
@@ -0,0 +1,160 @@
+/* linux/arch/arm/mach-s3c2410/s3c2412-dma.c
+ *
+ * (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2412 DMA selection
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sysdev.h>
+#include <asm/dma.h>
+#include <asm/arch/dma.h>
+#include <asm/io.h>
+#include "dma.h"
+#include "cpu.h"
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-ac97.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-sdi.h>
+#include <asm/arch/regs-iis.h>
+#include <asm/arch/regs-spi.h>
+#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }
+static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {
+        [DMACH_XD0] = {
+                .name           = "xdreq0",
+                .channels       = MAP(S3C2412_DMAREQSEL_XDREQ0),
+        },
+        [DMACH_XD1] = {
+                .name           = "xdreq1",
+                .channels       = MAP(S3C2412_DMAREQSEL_XDREQ1),
+        },
+        [DMACH_SDI] = {
+                .name           = "sdi",
+                .channels       = MAP(S3C2412_DMAREQSEL_SDI),
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_SPI0] = {
+                .name           = "spi0",
+                .channels       = MAP(S3C2412_DMAREQSEL_SPI0TX),
+                .hw_addr.to     = S3C2410_PA_SPI + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + S3C2410_SPRDAT,
+        },
+        [DMACH_SPI1] = {
+                .name           = "spi1",
+                .channels       = MAP(S3C2412_DMAREQSEL_SPI1TX),
+                .hw_addr.to     = S3C2410_PA_SPI + 0x20 + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + 0x20 + S3C2410_SPRDAT,
+        },
+        [DMACH_UART0] = {
+                .name           = "uart0",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART0_0),
+                .hw_addr.to     = S3C2410_PA_UART0 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART0 + S3C2410_URXH,
+        },
+        [DMACH_UART1] = {
+                .name           = "uart1",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART1_0),
+                .hw_addr.to     = S3C2410_PA_UART1 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART1 + S3C2410_URXH,
+        },
+        [DMACH_UART2] = {
+                .name           = "uart2",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART2_0),
+                .hw_addr.to     = S3C2410_PA_UART2 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART2 + S3C2410_URXH,
+        },
+        [DMACH_UART0_SRC2] = {
+                .name           = "uart0",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART0_1),
+                .hw_addr.to     = S3C2410_PA_UART0 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART0 + S3C2410_URXH,
+        },
+        [DMACH_UART1_SRC2] = {
+                .name           = "uart1",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART1_1),
+                .hw_addr.to     = S3C2410_PA_UART1 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART1 + S3C2410_URXH,
+        },
+        [DMACH_UART2_SRC2] = {
+                .name           = "uart2",
+                .channels       = MAP(S3C2412_DMAREQSEL_UART2_1),
+                .hw_addr.to     = S3C2410_PA_UART2 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART2 + S3C2410_URXH,
+        },
+        [DMACH_TIMER] = {
+                .name           = "timer",
+                .channels       = MAP(S3C2412_DMAREQSEL_TIMER),
+        },
+        [DMACH_I2S_IN] = {
+                .name           = "i2s-sdi",
+                .channels       = MAP(S3C2412_DMAREQSEL_I2SRX),
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_I2S_OUT] = {
+                .name           = "i2s-sdo",
+                .channels       = MAP(S3C2412_DMAREQSEL_I2STX),
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_USB_EP1] = {
+                .name           = "usb-ep1",
+                .channels       = MAP(S3C2412_DMAREQSEL_USBEP1),
+        },
+        [DMACH_USB_EP2] = {
+                .name           = "usb-ep2",
+                .channels       = MAP(S3C2412_DMAREQSEL_USBEP2),
+        },
+        [DMACH_USB_EP3] = {
+                .name           = "usb-ep3",
+                .channels       = MAP(S3C2412_DMAREQSEL_USBEP3),
+        },
+        [DMACH_USB_EP4] = {
+                .name           = "usb-ep4",
+                .channels       = MAP(S3C2412_DMAREQSEL_USBEP4),
+        },
+};
+static void s3c2412_dma_select(struct s3c2410_dma_chan *chan,
+                               struct s3c24xx_dma_map *map)
+{
+        writel(chan->regs + S3C2412_DMA_DMAREQSEL,
+               map->channels[0] | S3C2412_DMAREQSEL_HW);
+}
+static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {
+        .select         = s3c2412_dma_select,
+        .dcon_mask      = 0,
+        .map            = s3c2412_dma_mappings,
+        .map_size       = ARRAY_SIZE(s3c2412_dma_mappings),
+};
+static int s3c2412_dma_add(struct sys_device *sysdev)
+{
+        return s3c24xx_dma_init_map(&s3c2412_dma_sel);
+}
+static struct sysdev_driver s3c2412_dma_driver = {
+        .add    = s3c2412_dma_add,
+};
+static int __init s3c2412_dma_init(void)
+{
+        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_dma_driver);
+}
+arch_initcall(s3c2412_dma_init);
diff --git a/arch/arm/mach-s3c2410/s3c2412-irq.c b/arch/arm/mach-s3c2410/s3c2412-irq.c
index c80ec93dfea9..7f741547658f 100644
--- a/arch/arm/mach-s3c2410/s3c2412-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2412-irq.c
@@ -37,6 +37,7 @@
 #include "cpu.h"
 #include "irq.h"
+#include "pm.h"
 /* the s3c2412 changes the behaviour of IRQ_EINT0 through IRQ_EINT3 by
 * having them turn up in both the INT* and the EINT* registers. Whilst
@@ -120,6 +121,8 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
 static struct sysdev_driver s3c2412_irq_driver = {
        .add            = s3c2412_irq_add,
+        .suspend        = s3c24xx_irq_suspend,
+        .resume         = s3c24xx_irq_resume,
 };
 static int s3c2412_irq_init(void)
diff --git a/arch/arm/mach-s3c2410/s3c2412-pm.c b/arch/arm/mach-s3c2410/s3c2412-pm.c
new file mode 100644
index 000000000000..19b63322d259
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2412-pm.c
@@ -0,0 +1,128 @@
+/* linux/arch/arm/mach-s3c2410/s3c2412-pm.c
+ *
+ * Copyright (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://armlinux.simtec.co.uk/.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/sysdev.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/arch/regs-power.h>
+#include <asm/arch/regs-gpioj.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-dsc.h>
+#include "cpu.h"
+#include "pm.h"
+#include "s3c2412.h"
+static void s3c2412_cpu_suspend(void)
+{
+        unsigned long tmp;
+        /* set our standby method to sleep */
+        tmp = __raw_readl(S3C2412_PWRCFG);
+        tmp |= S3C2412_PWRCFG_STANDBYWFI_SLEEP;
+        __raw_writel(tmp, S3C2412_PWRCFG);
+        /* issue the standby signal into the pm unit. Note, we
+         * issue a write-buffer drain just in case */
+        tmp = 0;
+        asm("b 1f\n\t"
+            ".align 5\n\t"
+            "1:\n\t"
+            "mcr p15, 0, %0, c7, c10, 4\n\t"
+            "mcr p15, 0, %0, c7, c0, 4" :: "r" (tmp));
+        /* we should never get past here */
+        panic("sleep resumed to originator?");
+}
+static void s3c2412_pm_prepare(void)
+{
+}
+static int s3c2412_pm_add(struct sys_device *sysdev)
+{
+        pm_cpu_prep = s3c2412_pm_prepare;
+        pm_cpu_sleep = s3c2412_cpu_suspend;
+        return 0;
+}
+static struct sleep_save s3c2412_sleep[] = {
+        SAVE_ITEM(S3C2412_DSC0),
+        SAVE_ITEM(S3C2412_DSC1),
+        SAVE_ITEM(S3C2413_GPJDAT),
+        SAVE_ITEM(S3C2413_GPJCON),
+        SAVE_ITEM(S3C2413_GPJUP),
+        /* save the PWRCFG to get back to original sleep method */
+        SAVE_ITEM(S3C2412_PWRCFG),
+        /* save the sleep configuration anyway, just in case these
+         * get damaged during wakeup */
+        SAVE_ITEM(S3C2412_GPBSLPCON),
+        SAVE_ITEM(S3C2412_GPCSLPCON),
+        SAVE_ITEM(S3C2412_GPDSLPCON),
+        SAVE_ITEM(S3C2412_GPESLPCON),
+        SAVE_ITEM(S3C2412_GPFSLPCON),
+        SAVE_ITEM(S3C2412_GPGSLPCON),
+        SAVE_ITEM(S3C2412_GPHSLPCON),
+        SAVE_ITEM(S3C2413_GPJSLPCON),
+};
+static int s3c2412_pm_suspend(struct sys_device *dev, pm_message_t state)
+{
+        s3c2410_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
+        return 0;
+}
+static int s3c2412_pm_resume(struct sys_device *dev)
+{
+        unsigned long tmp;
+        tmp = __raw_readl(S3C2412_PWRCFG);
+        tmp &= ~S3C2412_PWRCFG_STANDBYWFI_MASK;
+        tmp |=  S3C2412_PWRCFG_STANDBYWFI_IDLE;
+        __raw_writel(tmp, S3C2412_PWRCFG);
+        s3c2410_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
+        return 0;
+}
+static struct sysdev_driver s3c2412_pm_driver = {
+        .add            = s3c2412_pm_add,
+        .suspend        = s3c2412_pm_suspend,
+        .resume         = s3c2412_pm_resume,
+};
+static __init int s3c2412_pm_init(void)
+{
+        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_pm_driver);
+}
+arch_initcall(s3c2412_pm_init);
diff --git a/arch/arm/mach-s3c2410/s3c2412.c b/arch/arm/mach-s3c2410/s3c2412.c
index 2d163f7600be..e76431c41461 100644
--- a/arch/arm/mach-s3c2410/s3c2412.c
+++ b/arch/arm/mach-s3c2410/s3c2412.c
@@ -8,17 +8,6 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *     16-May-2003 BJD  Created initial version
- *     16-Aug-2003 BJD  Fixed header files and copyright, added URL
- *     05-Sep-2003 BJD  Moved to kernel v2.6
- *     18-Jan-2004 BJD  Added serial port configuration
- *     21-Aug-2004 BJD  Added new struct s3c2410_board handler
- *     28-Sep-2004 BJD  Updates for new serial port bits
- *     04-Nov-2004 BJD  Updated UART configuration process
- *     10-Jan-2005 BJD  Removed s3c2410_clock_tick_rate
- *     13-Aug-2005 DA   Removed UART from initial I/O mappings
 */
 #include <linux/kernel.h>
@@ -56,6 +45,13 @@
 #ifndef CONFIG_CPU_S3C2412_ONLY
 void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
+static inline void s3c2412_init_gpio2(void)
+{
+        s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
+}
+#else
+#define s3c2412_init_gpio2() do { } while(0)
 #endif
 /* Initial IO mappings */
@@ -76,6 +72,7 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no)
        /* rename devices that are s3c2412/s3c2413 specific */
        s3c_device_sdi.name  = "s3c2412-sdi";
+        s3c_device_lcd.name  = "s3c2412-lcd";
        s3c_device_nand.name = "s3c2412-nand";
 }
@@ -110,7 +107,7 @@ void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size)
 {
        /* move base of IO */
-        s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
+        s3c2412_init_gpio2();
        /* set our idle function */
@@ -161,48 +158,8 @@ void __init s3c2412_init_clocks(int xtal)
 * as a driver which may support both 2410 and 2440 may try and use it.
 */
-#ifdef CONFIG_PM
-static struct sleep_save s3c2412_sleep[] = {
-        SAVE_ITEM(S3C2412_DSC0),
-        SAVE_ITEM(S3C2412_DSC1),
-        SAVE_ITEM(S3C2413_GPJDAT),
-        SAVE_ITEM(S3C2413_GPJCON),
-        SAVE_ITEM(S3C2413_GPJUP),
-        /* save the sleep configuration anyway, just in case these
-         * get damaged during wakeup */
-        SAVE_ITEM(S3C2412_GPBSLPCON),
-        SAVE_ITEM(S3C2412_GPCSLPCON),
-        SAVE_ITEM(S3C2412_GPDSLPCON),
-        SAVE_ITEM(S3C2412_GPESLPCON),
-        SAVE_ITEM(S3C2412_GPFSLPCON),
-        SAVE_ITEM(S3C2412_GPGSLPCON),
-        SAVE_ITEM(S3C2412_GPHSLPCON),
-        SAVE_ITEM(S3C2413_GPJSLPCON),
-};
-static int s3c2412_suspend(struct sys_device *dev, pm_message_t state)
-{
-        s3c2410_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
-        return 0;
-}
-static int s3c2412_resume(struct sys_device *dev)
-{
-        s3c2410_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
-        return 0;
-}
-#else
-#define s3c2412_suspend NULL
-#define s3c2412_resume  NULL
-#endif
 struct sysdev_class s3c2412_sysclass = {
        set_kset_name("s3c2412-core"),
-        .suspend        = s3c2412_suspend,
-        .resume         = s3c2412_resume
 };
 static int __init s3c2412_core_init(void)
diff --git a/arch/arm/mach-s3c2410/s3c2440-dma.c b/arch/arm/mach-s3c2410/s3c2440-dma.c
new file mode 100644
index 000000000000..11e109c84a15
--- /dev/null
+++ b/arch/arm/mach-s3c2410/s3c2440-dma.c
@@ -0,0 +1,164 @@
+/* linux/arch/arm/mach-s3c2410/s3c2440-dma.c
+ *
+ * (c) 2006 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C2440 DMA selection
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sysdev.h>
+#include <asm/dma.h>
+#include <asm/arch/dma.h>
+#include "dma.h"
+#include "cpu.h"
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-ac97.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-sdi.h>
+#include <asm/arch/regs-iis.h>
+#include <asm/arch/regs-spi.h>
+static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
+        [DMACH_XD0] = {
+                .name           = "xdreq0",
+                .channels[0]    = S3C2410_DCON_CH0_XDREQ0 | DMA_CH_VALID,
+        },
+        [DMACH_XD1] = {
+                .name           = "xdreq1",
+                .channels[1]    = S3C2410_DCON_CH1_XDREQ1 | DMA_CH_VALID,
+        },
+        [DMACH_SDI] = {
+                .name           = "sdi",
+                .channels[0]    = S3C2410_DCON_CH0_SDI | DMA_CH_VALID,
+                .channels[1]    = S3C2440_DCON_CH1_SDI | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_SDI | DMA_CH_VALID,
+                .channels[3]    = S3C2410_DCON_CH3_SDI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_SPI0] = {
+                .name           = "spi0",
+                .channels[1]    = S3C2410_DCON_CH1_SPI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_SPI + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + S3C2410_SPRDAT,
+        },
+        [DMACH_SPI1] = {
+                .name           = "spi1",
+                .channels[3]    = S3C2410_DCON_CH3_SPI | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_SPI + 0x20 + S3C2410_SPTDAT,
+                .hw_addr.from   = S3C2410_PA_SPI + 0x20 + S3C2410_SPRDAT,
+        },
+        [DMACH_UART0] = {
+                .name           = "uart0",
+                .channels[0]    = S3C2410_DCON_CH0_UART0 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART0 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART0 + S3C2410_URXH,
+        },
+        [DMACH_UART1] = {
+                .name           = "uart1",
+                .channels[1]    = S3C2410_DCON_CH1_UART1 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART1 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART1 + S3C2410_URXH,
+        },
+        [DMACH_UART2] = {
+                .name           = "uart2",
+                .channels[3]    = S3C2410_DCON_CH3_UART2 | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_UART2 + S3C2410_UTXH,
+                .hw_addr.from   = S3C2410_PA_UART2 + S3C2410_URXH,
+        },
+        [DMACH_TIMER] = {
+                .name           = "timer",
+                .channels[0]    = S3C2410_DCON_CH0_TIMER | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_TIMER | DMA_CH_VALID,
+                .channels[3]    = S3C2410_DCON_CH3_TIMER | DMA_CH_VALID,
+        },
+        [DMACH_I2S_IN] = {
+                .name           = "i2s-sdi",
+                .channels[1]    = S3C2410_DCON_CH1_I2SSDI | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_I2SSDI | DMA_CH_VALID,
+                .hw_addr.from   = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_I2S_OUT] = {
+                .name           = "i2s-sdo",
+                .channels[0]    = S3C2440_DCON_CH0_I2SSDO | DMA_CH_VALID,
+                .channels[2]    = S3C2410_DCON_CH2_I2SSDO | DMA_CH_VALID,
+                .hw_addr.to     = S3C2410_PA_IIS + S3C2410_IISFIFO,
+        },
+        [DMACH_PCM_IN] = {
+                .name           = "pcm-in",
+                .channels[0]    = S3C2440_DCON_CH0_PCMIN | DMA_CH_VALID,
+                .channels[2]    = S3C2440_DCON_CH2_PCMIN | DMA_CH_VALID,
+                .hw_addr.from   = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA,
+        },
+        [DMACH_PCM_OUT] = {
+                .name           = "pcm-out",
+                .channels[1]    = S3C2440_DCON_CH1_PCMOUT | DMA_CH_VALID,
+                .channels[3]    = S3C2440_DCON_CH3_PCMOUT | DMA_CH_VALID,
+                .hw_addr.to     = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA,
+        },
+        [DMACH_MIC_IN] = {
+                .name           = "mic-in",
+                .channels[2]    = S3C2440_DCON_CH2_MICIN | DMA_CH_VALID,
+                .channels[3]    = S3C2440_DCON_CH3_MICIN | DMA_CH_VALID,
+                .hw_addr.from   = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA,
+        },
+        [DMACH_USB_EP1] = {
+                .name           = "usb-ep1",
+                .channels[0]    = S3C2410_DCON_CH0_USBEP1 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP2] = {
+                .name           = "usb-ep2",
+                .channels[1]    = S3C2410_DCON_CH1_USBEP2 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP3] = {
+                .name           = "usb-ep3",
+                .channels[2]    = S3C2410_DCON_CH2_USBEP3 | DMA_CH_VALID,
+        },
+        [DMACH_USB_EP4] = {
+                .name           = "usb-ep4",
+                .channels[3]    = S3C2410_DCON_CH3_USBEP4 | DMA_CH_VALID,
+        },
+};
+static void s3c2440_dma_select(struct s3c2410_dma_chan *chan,
+                               struct s3c24xx_dma_map *map)
+{
+        chan->dcon = map->channels[chan->number] & ~DMA_CH_VALID;
+}
+static struct s3c24xx_dma_selection __initdata s3c2440_dma_sel = {
+        .select         = s3c2440_dma_select,
+        .dcon_mask      = 7 << 24,
+        .map            = s3c2440_dma_mappings,
+        .map_size       = ARRAY_SIZE(s3c2440_dma_mappings),
+};
+static int s3c2440_dma_add(struct sys_device *sysdev)
+{
+        return s3c24xx_dma_init_map(&s3c2440_dma_sel);
+}
+static struct sysdev_driver s3c2440_dma_driver = {
+        .add    = s3c2440_dma_add,
+};
+static int __init s3c2440_dma_init(void)
+{
+        return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_dma_driver);
+}
+arch_initcall(s3c2440_dma_init);
diff --git a/arch/arm/mach-s3c2410/s3c2440-dsc.c b/arch/arm/mach-s3c2410/s3c2440-dsc.c
index 16fa2a3b38fa..c92ea66ba45e 100644
--- a/arch/arm/mach-s3c2410/s3c2440-dsc.c
+++ b/arch/arm/mach-s3c2410/s3c2440-dsc.c
@@ -8,11 +8,6 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *     29-Aug-2004 BJD  Start of drive-strength control
- *     09-Nov-2004 BJD  Added symbol export
- *     11-Jan-2005 BJD  Include fix
 */
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-s3c2410/s3c2440-irq.c b/arch/arm/mach-s3c2410/s3c2440-irq.c
index 1667ba1fa43d..fc08febe2e54 100644
--- a/arch/arm/mach-s3c2410/s3c2440-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2440-irq.c
@@ -119,7 +119,7 @@ static int s3c2440_irq_add(struct sys_device *sysdev)
 }
 static struct sysdev_driver s3c2440_irq_driver = {
-        .add    = s3c2440_irq_add,
+        .add            = s3c2440_irq_add,
 };
 static int s3c2440_irq_init(void)
diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c
index 44c5affa9b89..0d13546c3500 100644
--- a/arch/arm/mach-s3c2410/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2410/s3c244x-irq.c
@@ -120,7 +120,9 @@ static int s3c244x_irq_add(struct sys_device *sysdev)
 }
 static struct sysdev_driver s3c2440_irq_driver = {
-        .add    = s3c244x_irq_add,
+        .add            = s3c244x_irq_add,
+        .suspend        = s3c24xx_irq_suspend,
+        .resume         = s3c24xx_irq_resume,
 };
 static int s3c2440_irq_init(void)
@@ -131,9 +133,12 @@ static int s3c2440_irq_init(void)
 arch_initcall(s3c2440_irq_init);
 static struct sysdev_driver s3c2442_irq_driver = {
-        .add    = s3c244x_irq_add,
+        .add            = s3c244x_irq_add,
+        .suspend        = s3c24xx_irq_suspend,
+        .resume         = s3c24xx_irq_resume,
 };
 static int s3c2442_irq_init(void)
 {
        return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_irq_driver);
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S
index a7561a79fc82..2018c2e1dcc5 100644
--- a/arch/arm/mach-s3c2410/sleep.S
+++ b/arch/arm/mach-s3c2410/sleep.S
@@ -41,15 +41,25 @@
        .text
-        /* s3c2410_cpu_suspend
+        /* s3c2410_cpu_save
         *
-         * put the cpu into sleep mode
+         * save enough of the CPU state to allow us to re-start
+         * pm.c code. as we store items like the sp/lr, we will
+         * end up returning from this function when the cpu resumes
+         * so the return value is set to mark this.
+         *
+         * This arangement means we avoid having to flush the cache
+         * from this code.
         *
         * entry:
-         *      r0 = sleep save block
+         *      r0 = pointer to save block
+         *
+         * exit:
+         *      r0 = 0 => we stored everything
+         *           1 => resumed from sleep
        */
-ENTRY(s3c2410_cpu_suspend)
+ENTRY(s3c2410_cpu_save)
        stmfd   sp!, { r4 - r12, lr }
        @@ store co-processor registers
@@ -62,44 +72,14 @@ ENTRY(s3c2410_cpu_suspend)
        stmia   r0, { r4 - r13 }
-        @@ flush the caches to ensure everything is back out to
+        mov     r0, #0
-        @@ SDRAM before the core powers down
+        ldmfd   sp, { r4 - r12, pc }
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
-        bl      arm920_flush_kern_cache_all
-#endif
-        @@ prepare cpu to sleep
-        ldr     r4, =S3C2410_REFRESH
-        ldr     r5, =S3C24XX_MISCCR
-        ldr     r6, =S3C2410_CLKCON
-        ldr     r7, [ r4 ]              @ get REFRESH (and ensure in TLB)
-        ldr     r8, [ r5 ]              @ get MISCCR (and ensure in TLB)
-        ldr     r9, [ r6 ]              @ get CLKCON (and ensure in TLB)
-        orr     r7, r7, #S3C2410_REFRESH_SELF   @ SDRAM sleep command
-        orr     r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
-        orr     r9, r9, #S3C2410_CLKCON_POWER   @ power down command
-        teq     pc, #0                  @ first as a trial-run to load cache
-        bl      s3c2410_do_sleep
-        teq     r0, r0                  @ now do it for real
-        b       s3c2410_do_sleep        @
-        @@ align next bit of code to cache line
-        .align  8
-s3c2410_do_sleep:
-        streq   r7, [ r4 ]                      @ SDRAM sleep command
-        streq   r8, [ r5 ]                      @ SDRAM power-down config
-        streq   r9, [ r6 ]                      @ CPU sleep
-1:      beq     1b
-        mov     pc, r14
        @@ return to the caller, after having the MMU
        @@ turned on, this restores the last bits from the
        @@ stack
 resume_with_mmu:
+        mov     r0, #1
        ldmfd   sp!, { r4 - r12, pc }
        .ltorg
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c
index 6b22d8f0a00d..c635efa7cd31 100644
--- a/arch/arm/mach-s3c2410/usb-simtec.c
+++ b/arch/arm/mach-s3c2410/usb-simtec.c
@@ -10,12 +10,6 @@
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
- *
- * Modifications:
- *      14-Sep-2004 BJD  Created
- *      18-Oct-2004 BJD  Cleanups, and added code to report OC cleared
- *      09-Aug-2005 BJD  Renamed s3c2410_report_oc to s3c2410_usb_report_oc
- *      09-Aug-2005 BJD  Ports powered only if both are enabled
 */
 #define DEBUG
author	Linus Torvalds <torvalds@g5.osdl.org>	2006-09-28 17:40:39 -0400
committer	Linus Torvalds <torvalds@g5.osdl.org>	2006-09-28 17:40:39 -0400
commit	ebdea46fecae40c4d7effcd33f40918a37a1df4b (patch)
tree	e4312bf7f1f3d184738963a0ec300aa9fdfd55c1 /arch/arm/mach-s3c2410
parent	fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (diff)
parent	250d375d1da45a5e08ab8baf5eaa7eb258afd82b (diff)