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

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

12 files changed, 107 insertions, 241 deletions

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 3e073467cac..2e32acca02f 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -12,7 +12,8 @@ config ICST307
 
 config SA1111
         bool
-        select DMABOUNCE
+        select DMABOUNCE if !ARCH_PXA
+        select ZONE_DMA if !ARCH_PXA
 
 config DMABOUNCE
         bool
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index aecc6c3f908..f030f0775be 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -154,9 +154,7 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
 #endif
 
         write_lock_irqsave(&device_info->lock, flags);
-
         list_add(&buf->node, &device_info->safe_buffers);
-
         write_unlock_irqrestore(&device_info->lock, flags);
 
         return buf;
@@ -205,8 +203,22 @@ free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *
 
 /* ************************************************** */
 
-static inline dma_addr_t
-map_single(struct device *dev, void *ptr, size_t size,
+static struct safe_buffer *find_safe_buffer_dev(struct device *dev,
+                dma_addr_t dma_addr, const char *where)
+{
+        if (!dev || !dev->archdata.dmabounce)
+                return NULL;
+        if (dma_mapping_error(dev, dma_addr)) {
+                if (dev)
+                        dev_err(dev, "Trying to %s invalid mapping\n", where);
+                else
+                        pr_err("unknown device: Trying to %s invalid mapping\n", where);
+                return NULL;
+        }
+        return find_safe_buffer(dev->archdata.dmabounce, dma_addr);
+}
+
+static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
                 enum dma_data_direction dir)
 {
         struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
@@ -270,33 +282,21 @@ map_single(struct device *dev, void *ptr, size_t size,
         return dma_addr;
 }
 
-static inline void
-unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                enum dma_data_direction dir)
+static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
+                size_t size, enum dma_data_direction dir)
 {
-        struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
-        struct safe_buffer *buf = NULL;
-
-        /*
-         * Trying to unmap an invalid mapping
-         */
-        if (dma_mapping_error(dev, dma_addr)) {
-                dev_err(dev, "Trying to unmap invalid mapping\n");
-                return;
-        }
-
-        if (device_info)
-                buf = find_safe_buffer(device_info, dma_addr);
+        struct safe_buffer *buf = find_safe_buffer_dev(dev, dma_addr, "unmap");
 
         if (buf) {
                 BUG_ON(buf->size != size);
+                BUG_ON(buf->direction != dir);
 
                 dev_dbg(dev,
                         "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
                         __func__, buf->ptr, virt_to_dma(dev, buf->ptr),
                         buf->safe, buf->safe_dma_addr);
 
-                DO_STATS ( device_info->bounce_count++ );
+                DO_STATS(dev->archdata.dmabounce->bounce_count++);
 
                 if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {
                         void *ptr = buf->ptr;
@@ -317,74 +317,7 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                         dmac_clean_range(ptr, ptr + size);
                         outer_clean_range(__pa(ptr), __pa(ptr) + size);
                 }
-                free_safe_buffer(device_info, buf);
-        }
-}
-
-static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                        enum dma_data_direction dir)
-{
-        struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
-        struct safe_buffer *buf = NULL;
-
-        if (device_info)
-                buf = find_safe_buffer(device_info, dma_addr);
-
-        if (buf) {
-                /*
-                 * Both of these checks from original code need to be
-                 * commented out b/c some drivers rely on the following:
-                 *
-                 * 1) Drivers may map a large chunk of memory into DMA space
-                 *    but only sync a small portion of it. Good example is
-                 *    allocating a large buffer, mapping it, and then
-                 *    breaking it up into small descriptors. No point
-                 *    in syncing the whole buffer if you only have to
-                 *    touch one descriptor.
-                 *
-                 * 2) Buffers that are mapped as DMA_BIDIRECTIONAL are
-                 *    usually only synced in one dir at a time.
-                 *
-                 * See drivers/net/eepro100.c for examples of both cases.
-                 *
-                 * -ds
-                 *
-                 * BUG_ON(buf->size != size);
-                 * BUG_ON(buf->direction != dir);
-                 */
-
-                dev_dbg(dev,
-                        "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
-                        __func__, buf->ptr, virt_to_dma(dev, buf->ptr),
-                        buf->safe, buf->safe_dma_addr);
-
-                DO_STATS ( device_info->bounce_count++ );
-
-                switch (dir) {
-                case DMA_FROM_DEVICE:
-                        dev_dbg(dev,
-                                "%s: copy back safe %p to unsafe %p size %d\n",
-                                __func__, buf->safe, buf->ptr, size);
-                        memcpy(buf->ptr, buf->safe, size);
-                        break;
-                case DMA_TO_DEVICE:
-                        dev_dbg(dev,
-                                "%s: copy out unsafe %p to safe %p, size %d\n",
-                                __func__,buf->ptr, buf->safe, size);
-                        memcpy(buf->safe, buf->ptr, size);
-                        break;
-                case DMA_BIDIRECTIONAL:
-                        BUG();  /* is this allowed?  what does it mean? */
-                default:
-                        BUG();
-                }
-                /*
-                 * No need to sync the safe buffer - it was allocated
-                 * via the coherent allocators.
-                 */
-                return 0;
-        } else {
-                return 1;
+                free_safe_buffer(dev->archdata.dmabounce, buf);
         }
 }
 
@@ -396,21 +329,29 @@ static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,
  * substitute the safe buffer for the unsafe one.
  * (basically move the buffer from an unsafe area to a safe one)
  */
-dma_addr_t
-dma_map_single(struct device *dev, void *ptr, size_t size,
+dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
                 enum dma_data_direction dir)
 {
-        dma_addr_t dma_addr;
-
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
                 __func__, ptr, size, dir);
 
-        BUG_ON(dir == DMA_NONE);
+        BUG_ON(!valid_dma_direction(dir));
 
-        dma_addr = map_single(dev, ptr, size, dir);
+        return map_single(dev, ptr, size, dir);
+}
+EXPORT_SYMBOL(dma_map_single);
 
-        return dma_addr;
+dma_addr_t dma_map_page(struct device *dev, struct page *page,
+                unsigned long offset, size_t size, enum dma_data_direction dir)
+{
+        dev_dbg(dev, "%s(page=%p,off=%#lx,size=%zx,dir=%x)\n",
+                __func__, page, offset, size, dir);
+
+        BUG_ON(!valid_dma_direction(dir));
+
+        return map_single(dev, page_address(page) + offset, size, dir);
 }
+EXPORT_SYMBOL(dma_map_page);
 
 /*
  * see if a mapped address was really a "safe" buffer and if so, copy
@@ -419,126 +360,76 @@ dma_map_single(struct device *dev, void *ptr, size_t size,
  * should be)
  */
 
-void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                        enum dma_data_direction dir)
+void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
+                enum dma_data_direction dir)
 {
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
                 __func__, (void *) dma_addr, size, dir);
 
-        BUG_ON(dir == DMA_NONE);
-
         unmap_single(dev, dma_addr, size, dir);
 }
+EXPORT_SYMBOL(dma_unmap_single);
 
-int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-                enum dma_data_direction dir)
+int dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr,
+                unsigned long off, size_t sz, enum dma_data_direction dir)
 {
-        int i;
-
-        dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
-                __func__, sg, nents, dir);
-
-        BUG_ON(dir == DMA_NONE);
-
-        for (i = 0; i < nents; i++, sg++) {
-                struct page *page = sg_page(sg);
-                unsigned int offset = sg->offset;
-                unsigned int length = sg->length;
-                void *ptr = page_address(page) + offset;
+        struct safe_buffer *buf;
 
-                sg->dma_address =
-                        map_single(dev, ptr, length, dir);
-        }
+        dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n",
+                __func__, addr, off, sz, dir);
 
-        return nents;
-}
-
-void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
-                enum dma_data_direction dir)
-{
-        int i;
+        buf = find_safe_buffer_dev(dev, addr, __func__);
+        if (!buf)
+                return 1;
 
-        dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
-                __func__, sg, nents, dir);
+        BUG_ON(buf->direction != dir);
 
-        BUG_ON(dir == DMA_NONE);
+        dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
+                __func__, buf->ptr, virt_to_dma(dev, buf->ptr),
+                buf->safe, buf->safe_dma_addr);
 
-        for (i = 0; i < nents; i++, sg++) {
-                dma_addr_t dma_addr = sg->dma_address;
-                unsigned int length = sg->length;
+        DO_STATS(dev->archdata.dmabounce->bounce_count++);
 
-                unmap_single(dev, dma_addr, length, dir);
+        if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {
+                dev_dbg(dev, "%s: copy back safe %p to unsafe %p size %d\n",
+                        __func__, buf->safe + off, buf->ptr + off, sz);
+                memcpy(buf->ptr + off, buf->safe + off, sz);
         }
+        return 0;
 }
+EXPORT_SYMBOL(dmabounce_sync_for_cpu);
 
-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_addr,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction dir)
-{
-        dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",
-                __func__, dma_addr, offset, size, dir);
-
-        if (sync_single(dev, dma_addr, offset + size, dir))
-                dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);
-}
-EXPORT_SYMBOL(dma_sync_single_range_for_cpu);
-
-void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_addr,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction dir)
-{
-        dev_dbg(dev, "%s(dma=%#x,off=%#lx,size=%zx,dir=%x)\n",
-                __func__, dma_addr, offset, size, dir);
-
-        if (sync_single(dev, dma_addr, offset + size, dir))
-                dma_cache_maint(dma_to_virt(dev, dma_addr) + offset, size, dir);
-}
-EXPORT_SYMBOL(dma_sync_single_range_for_device);
-
-void
-dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
-                        enum dma_data_direction dir)
+int dmabounce_sync_for_device(struct device *dev, dma_addr_t addr,
+                unsigned long off, size_t sz, enum dma_data_direction dir)
 {
-        int i;
-
-        dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
-                __func__, sg, nents, dir);
-
-        BUG_ON(dir == DMA_NONE);
+        struct safe_buffer *buf;
 
-        for (i = 0; i < nents; i++, sg++) {
-                dma_addr_t dma_addr = sg->dma_address;
-                unsigned int length = sg->length;
+        dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n",
+                __func__, addr, off, sz, dir);
 
-                sync_single(dev, dma_addr, length, dir);
-        }
-}
-
-void
-dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
-                        enum dma_data_direction dir)
-{
-        int i;
+        buf = find_safe_buffer_dev(dev, addr, __func__);
+        if (!buf)
+                return 1;
 
-        dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
-                __func__, sg, nents, dir);
+        BUG_ON(buf->direction != dir);
 
-        BUG_ON(dir == DMA_NONE);
+        dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
+                __func__, buf->ptr, virt_to_dma(dev, buf->ptr),
+                buf->safe, buf->safe_dma_addr);
 
-        for (i = 0; i < nents; i++, sg++) {
-                dma_addr_t dma_addr = sg->dma_address;
-                unsigned int length = sg->length;
+        DO_STATS(dev->archdata.dmabounce->bounce_count++);
 
-                sync_single(dev, dma_addr, length, dir);
+        if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) {
+                dev_dbg(dev, "%s: copy out unsafe %p to safe %p, size %d\n",
+                        __func__,buf->ptr + off, buf->safe + off, sz);
+                memcpy(buf->safe + off, buf->ptr + off, sz);
         }
+        return 0;
 }
+EXPORT_SYMBOL(dmabounce_sync_for_device);
 
-static int
-dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev, const char *name,
-                    unsigned long size)
+static int dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev,
+                const char *name, unsigned long size)
 {
         pool->size = size;
         DO_STATS(pool->allocs = 0);
@@ -549,9 +440,8 @@ dmabounce_init_pool(struct dmabounce_pool *pool, struct device *dev, const char
         return pool->pool ? 0 : -ENOMEM;
 }
 
-int
-dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
-                        unsigned long large_buffer_size)
+int dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
+                unsigned long large_buffer_size)
 {
         struct dmabounce_device_info *device_info;
         int ret;
@@ -607,9 +497,9 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
         kfree(device_info);
         return ret;
 }
+EXPORT_SYMBOL(dmabounce_register_dev);
 
-void
-dmabounce_unregister_dev(struct device *dev)
+void dmabounce_unregister_dev(struct device *dev)
 {
         struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
 
@@ -642,15 +532,6 @@ dmabounce_unregister_dev(struct device *dev)
 
         dev_info(dev, "dmabounce: device unregistered\n");
 }
-
-
-EXPORT_SYMBOL(dma_map_single);
-EXPORT_SYMBOL(dma_unmap_single);
-EXPORT_SYMBOL(dma_map_sg);
-EXPORT_SYMBOL(dma_unmap_sg);
-EXPORT_SYMBOL(dma_sync_sg_for_cpu);
-EXPORT_SYMBOL(dma_sync_sg_for_device);
-EXPORT_SYMBOL(dmabounce_register_dev);
 EXPORT_SYMBOL(dmabounce_unregister_dev);
 
 MODULE_AUTHOR("Christopher Hoover <ch@hpl.hp.com>, Deepak Saxena <dsaxena@plexity.net>");
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 0c89bd35e06..7fc9860a97d 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -27,9 +27,9 @@
 #include <linux/list.h>
 #include <linux/smp.h>
 #include <linux/cpumask.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
-#include <asm/io.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/gic.h>
 
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index 5fe9588db07..2793447621c 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -66,14 +66,6 @@ static void it8152_unmask_irq(unsigned int irq)
        }
 }
 
-static inline void it8152_irq(int irq)
-{
-        struct irq_desc *desc;
-
-        desc = irq_desc + irq;
-        desc_handle_irq(irq, desc);
-}
-
 static struct irq_chip it8152_irq_chip = {
         .name           = "it8152",
         .ack            = it8152_mask_irq,
@@ -128,21 +120,21 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
                bits_pd &= ((1 << IT8152_PD_IRQ_COUNT) - 1);
                while (bits_pd) {
                        i = __ffs(bits_pd);
-                       it8152_irq(IT8152_PD_IRQ(i));
+                       generic_handle_irq(IT8152_PD_IRQ(i));
                        bits_pd &= ~(1 << i);
                }
 
                bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
                while (bits_lp) {
                        i = __ffs(bits_lp);
-                       it8152_irq(IT8152_LP_IRQ(i));
+                       generic_handle_irq(IT8152_LP_IRQ(i));
                        bits_lp &= ~(1 << i);
                }
 
                bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
                while (bits_ld) {
                        i = __ffs(bits_ld);
-                       it8152_irq(IT8152_LD_IRQ(i));
+                       generic_handle_irq(IT8152_LD_IRQ(i));
                        bits_ld &= ~(1 << i);
                }
        }
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 283051eaf93..7c6b4b99a2d 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -24,9 +24,9 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
@@ -169,7 +169,6 @@ static struct locomo_dev_info locomo_devices[] = {
 static void locomo_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         /* Acknowledge the parent IRQ */
@@ -181,10 +180,9 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc)
         if (req) {
                 /* generate the next interrupt(s) */
                 irq = LOCOMO_IRQ_START;
-                d = irq_desc + irq;
-                for (i = 0; i <= 3; i++, d++, irq++) {
+                for (i = 0; i <= 3; i++, irq++) {
                         if (req & (0x0100 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
 
                 }
@@ -222,12 +220,10 @@ static struct irq_chip locomo_chip = {
 
 static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
-                d = irq_desc + LOCOMO_IRQ_KEY_START;
-                desc_handle_irq(LOCOMO_IRQ_KEY_START, d);
+                generic_handle_irq(LOCOMO_IRQ_KEY_START);
         }
 }
 
@@ -268,7 +264,6 @@ static struct irq_chip locomo_key_chip = {
 static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         req =   locomo_readl(mapbase + LOCOMO_GIR) &
@@ -277,10 +272,9 @@ static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 
         if (req) {
                 irq = LOCOMO_IRQ_GPIO_START;
-                d = irq_desc + LOCOMO_IRQ_GPIO_START;
-                for (i = 0; i <= 15; i++, irq++, d++) {
+                for (i = 0; i <= 15; i++, irq++) {
                         if (req & (0x0001 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
                 }
         }
@@ -361,12 +355,10 @@ static struct irq_chip locomo_gpio_chip = {
 
 static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
-                d = irq_desc + LOCOMO_IRQ_LT_START;
-                desc_handle_irq(LOCOMO_IRQ_LT_START, d);
+                generic_handle_irq(LOCOMO_IRQ_LT_START);
         }
 }
 
@@ -407,17 +399,15 @@ static struct irq_chip locomo_lt_chip = {
 static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irq_desc *d;
         void __iomem *mapbase = get_irq_chip_data(irq);
 
         req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;
         if (req) {
                 irq = LOCOMO_IRQ_SPI_START;
-                d = irq_desc + irq;
 
-                for (i = 0; i <= 3; i++, irq++, d++) {
+                for (i = 0; i <= 3; i++, irq++) {
                         if (req & (0x0001 << i)) {
-                                desc_handle_irq(irq, d);
+                                generic_handle_irq(irq);
                         }
                 }
         }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index ec8a5471bf0..fb86f248aab 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -25,10 +25,10 @@
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/sizes.h>
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index ae39553589d..697c6491399 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -15,7 +15,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/hardware/scoop.h>
 
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
index aad4d94ba8f..d56c932580e 100644
--- a/arch/arm/common/sharpsl_param.c
+++ b/arch/arm/common/sharpsl_param.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/string.h>
 #include <asm/mach/sharpsl_param.h>
 
@@ -36,6 +37,7 @@
 #define PHAD_MAGIC      MAGIC_CHG('P','H','A','D')
 
 struct sharpsl_param_info sharpsl_param;
+EXPORT_SYMBOL(sharpsl_param);
 
 void sharpsl_save_param(void)
 {
diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c
index df0983aafe6..deeed561b16 100644
--- a/arch/arm/common/time-acorn.c
+++ b/arch/arm/common/time-acorn.c
@@ -17,9 +17,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/hardware/ioc.h>
 
 #include <asm/mach/time.h>
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c
index 7ecd3c0ab01..b520e56216a 100644
--- a/arch/arm/common/uengine.c
+++ b/arch/arm/common/uengine.c
@@ -16,9 +16,9 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/hardware/uengine.h>
-#include <asm/io.h>
 
 #if defined(CONFIG_ARCH_IXP2000)
 #define IXP_UENGINE_CSR_VIRT_BASE       IXP2000_UENGINE_CSR_VIRT_BASE
diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c
index 79a8206e62a..8421d39109b 100644
--- a/arch/arm/common/via82c505.c
+++ b/arch/arm/common/via82c505.c
@@ -4,8 +4,8 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/system.h>
 
 #include <asm/mach/pci.h>
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index c026fa2214a..f1e4b8f60ca 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -20,8 +20,8 @@
  */
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/vic.h>