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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
  ARM: DMA: add support for DMA debugging
  ARM: PL011: add DMA burst threshold support for ST variants
  ARM: PL011: Add support for transmit DMA
  ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
  ARM: PL011: Separate hardware FIFO size from TTY FIFO size
  ARM: PL011: Allow better handling of vendor data
  ARM: PL011: Ensure error flags are clear at startup
  ARM: PL011: include revision number in boot-time port printk
  ARM: vexpress: add sched_clock() for Versatile Express
  ARM i.MX53: Make MX53 EVK bootable
  ARM i.MX53: Some bug fix about MX53 MSL code
  ARM: 6607/1: sa1100: Update platform device registration
  ARM: 6606/1: sa1100: Fix platform device registration
  ARM i.MX51: rename IPU irqs
  ARM i.MX51: Add ipu clock support
  ARM: imx/mx27_3ds: Add PMIC support
  ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
  mx51: fix usb clock support
  MX51: Add support for usb host 2
  arch/arm/plat-mxc/ehci.c: fix errors/typos
  ...

1 files changed, 145 insertions, 0 deletions

diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
new file mode 100644
index 000000000000..fe69f5fac1bb
--- /dev/null
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
+ * License terms: GNU General Public License (GPL), version 2.
+ */
+
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/amba/bus.h>
+
+#include <plat/gpio.h>
+
+#include <mach/hardware.h>
+
+#include "devices-common.h"
+
+struct amba_device *
+dbx500_add_amba_device(const char *name, resource_size_t base,
+                       int irq, void *pdata, unsigned int periphid)
+{
+        struct amba_device *dev;
+        int ret;
+
+        dev = kzalloc(sizeof *dev, GFP_KERNEL);
+        if (!dev)
+                return ERR_PTR(-ENOMEM);
+
+        dev->dev.init_name = name;
+
+        dev->res.start = base;
+        dev->res.end = base + SZ_4K - 1;
+        dev->res.flags = IORESOURCE_MEM;
+
+        dev->dma_mask = DMA_BIT_MASK(32);
+        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+        dev->irq[0] = irq;
+        dev->irq[1] = NO_IRQ;
+
+        dev->periphid = periphid;
+
+        dev->dev.platform_data = pdata;
+
+        ret = amba_device_register(dev, &iomem_resource);
+        if (ret) {
+                kfree(dev);
+                return ERR_PTR(ret);
+        }
+
+        return dev;
+}
+
+static struct platform_device *
+dbx500_add_platform_device(const char *name, int id, void *pdata,
+                           struct resource *res, int resnum)
+{
+        struct platform_device *dev;
+        int ret;
+
+        dev = platform_device_alloc(name, id);
+        if (!dev)
+                return ERR_PTR(-ENOMEM);
+
+        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
+
+        ret = platform_device_add_resources(dev, res, resnum);
+        if (ret)
+                goto out_free;
+
+        dev->dev.platform_data = pdata;
+
+        ret = platform_device_add(dev);
+        if (ret)
+                goto out_free;
+
+        return dev;
+
+out_free:
+        platform_device_put(dev);
+        return ERR_PTR(ret);
+}
+
+struct platform_device *
+dbx500_add_platform_device_4k1irq(const char *name, int id,
+                                  resource_size_t base,
+                                  int irq, void *pdata)
+{
+        struct resource resources[] = {
+                [0] = {
+                        .start  = base,
+                        .end    = base + SZ_4K - 1,
+                        .flags  = IORESOURCE_MEM,
+                },
+                [1] = {
+                        .start  = irq,
+                        .end    = irq,
+                        .flags  = IORESOURCE_IRQ,
+                }
+        };
+
+        return dbx500_add_platform_device(name, id, pdata, resources,
+                                          ARRAY_SIZE(resources));
+}
+
+static struct platform_device *
+dbx500_add_gpio(int id, resource_size_t addr, int irq,
+                struct nmk_gpio_platform_data *pdata)
+{
+        struct resource resources[] = {
+                {
+                        .start  = addr,
+                        .end    = addr + 127,
+                        .flags  = IORESOURCE_MEM,
+                },
+                {
+                        .start  = irq,
+                        .end    = irq,
+                        .flags  = IORESOURCE_IRQ,
+                }
+        };
+
+        return platform_device_register_resndata(NULL, "gpio", id,
+                                resources, ARRAY_SIZE(resources),
+                                pdata, sizeof(*pdata));
+}
+
+void dbx500_add_gpios(resource_size_t *base, int num, int irq,
+                      struct nmk_gpio_platform_data *pdata)
+{
+        int first = 0;
+        int i;
+
+        for (i = 0; i < num; i++, first += 32, irq++) {
+                pdata->first_gpio = first;
+                pdata->first_irq = NOMADIK_GPIO_TO_IRQ(first);
+
+                dbx500_add_gpio(i, base[i], irq, pdata);
+        }
+}