Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM platform updates from Russell King:
 "This covers platform stuff for platforms I have a direct interest in
  (iow, I have the hardware).  Essentially:
   - as we no longer support any other Acorn platforms other than RiscPC
     anymore, we can collect all that code into mach-rpc.
   - convert Acorn expansion card stuff to use IRQ allocation functions,
     and get rid of NO_IRQ from there.
   - cleanups to the ebsa110 platform to move some private stuff out of
     its header files.
   - large amount of SA11x0 updates:
   - conversion of private DMA implementation to DMA engine support
     (this actually gives us greater flexibility in drivers over the old
     API.)
   - re-worked ucb1x00 updates - convert to genirq, remove sa11x0
     dependencies, fix various minor issues
   - move platform specific sa11x0 framebuffer data into platform files
     in arch/arm instead of keeping this in the driver itself
   - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
     for SIR transmissions as well as FIR
   - rework sa1111 support for genirq, and irq allocation
   - fix sa1111 IRQ support so it works again
   - use sparse IRQ support

  After this, I have one more pull request remaining from my current
  set, which I think is going to be the most problematical as it
  generates 8 conflicts."

Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
Russell.

* 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
  ARM: 7343/1: sa11x0: convert to sparse IRQ
  ARM: 7342/2: sa1100: prepare for sparse irq conversion
  ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
  ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
  ARM: sa11x0: remove unused DMA controller definitions
  ARM: sa11x0: remove old SoC private DMA driver
  USB: sa1111: add hcd .reset method
  USB: sa1111: add OHCI shutdown methods
  USB: sa1111: reorganize ohci-sa1111.c
  USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
  USB: sa1111: sparse and checkpatch cleanups
  ARM: sa11x0: don't static map sa1111
  ARM: sa1111: use dev_err() rather than printk()
  ARM: sa1111: cleanup sub-device registration and unregistration
  ARM: sa1111: only setup DMA for DMA capable devices
  ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
  ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
  ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
  ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
  ARM: sa1111: delete unused physical GPIO register definitions
  ...

1 files changed, 0 insertions, 112 deletions

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 502821997707..cbc3b7867910 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -23,106 +23,6 @@
 #include <asm/sizes.h>
 #include <asm/mach/flash.h>
 
-#if 0
-/*
- * This is here for documentation purposes only - until these people
- * submit their machine types.  It will be gone January 2005.
- */
-static struct mtd_partition consus_partitions[] = {
-        {
-                .name           = "Consus boot firmware",
-                .offset         = 0,
-                .size           = 0x00040000,
-                .mask_flags     = MTD_WRITABLE, /* force read-only */
-        }, {
-                .name           = "Consus kernel",
-                .offset         = 0x00040000,
-                .size           = 0x00100000,
-                .mask_flags     = 0,
-        }, {
-                .name           = "Consus disk",
-                .offset         = 0x00140000,
-                /* The rest (up to 16M) for jffs.  We could put 0 and
-                   make it find the size automatically, but right now
-                   i have 32 megs.  jffs will use all 32 megs if given
-                   the chance, and this leads to horrible problems
-                   when you try to re-flash the image because blob
-                   won't erase the whole partition. */
-                .size           = 0x01000000 - 0x00140000,
-                .mask_flags     = 0,
-        }, {
-                /* this disk is a secondary disk, which can be used as
-                   needed, for simplicity, make it the size of the other
-                   consus partition, although realistically it could be
-                   the remainder of the disk (depending on the file
-                   system used) */
-                 .name          = "Consus disk2",
-                 .offset        = 0x01000000,
-                 .size          = 0x01000000 - 0x00140000,
-                 .mask_flags    = 0,
-        }
-};
-
-/* Frodo has 2 x 16M 28F128J3A flash chips in bank 0: */
-static struct mtd_partition frodo_partitions[] =
-{
-        {
-                .name           = "bootloader",
-                .size           = 0x00040000,
-                .offset         = 0x00000000,
-                .mask_flags     = MTD_WRITEABLE
-        }, {
-                .name           = "bootloader params",
-                .size           = 0x00040000,
-                .offset         = MTDPART_OFS_APPEND,
-                .mask_flags     = MTD_WRITEABLE
-        }, {
-                .name           = "kernel",
-                .size           = 0x00100000,
-                .offset         = MTDPART_OFS_APPEND,
-                .mask_flags     = MTD_WRITEABLE
-        }, {
-                .name           = "ramdisk",
-                .size           = 0x00400000,
-                .offset         = MTDPART_OFS_APPEND,
-                .mask_flags     = MTD_WRITEABLE
-        }, {
-                .name           = "file system",
-                .size           = MTDPART_SIZ_FULL,
-                .offset         = MTDPART_OFS_APPEND
-        }
-};
-
-static struct mtd_partition jornada56x_partitions[] = {
-        {
-                .name           = "bootldr",
-                .size           = 0x00040000,
-                .offset         = 0,
-                .mask_flags     = MTD_WRITEABLE,
-        }, {
-                .name           = "rootfs",
-                .size           = MTDPART_SIZ_FULL,
-                .offset         = MTDPART_OFS_APPEND,
-        }
-};
-
-static void jornada56x_set_vpp(int vpp)
-{
-        if (vpp)
-                GPSR = GPIO_GPIO26;
-        else
-                GPCR = GPIO_GPIO26;
-        GPDR |= GPIO_GPIO26;
-}
-
-/*
- * Machine        Phys          Size    set_vpp
- * Consus    : SA1100_CS0_PHYS SZ_32M
- * Frodo     : SA1100_CS0_PHYS SZ_32M
- * Jornada56x: SA1100_CS0_PHYS SZ_32M jornada56x_set_vpp
- */
-#endif
-
 struct sa_subdev_info {
         char name[16];
         struct map_info map;
@@ -373,21 +273,9 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static void sa1100_mtd_shutdown(struct platform_device *dev)
-{
-        struct sa_info *info = platform_get_drvdata(dev);
-        if (info && mtd_suspend(info->mtd) == 0)
-                mtd_resume(info->mtd);
-}
-#else
-#define sa1100_mtd_shutdown NULL
-#endif
-
 static struct platform_driver sa1100_mtd_driver = {
         .probe          = sa1100_mtd_probe,
         .remove         = __exit_p(sa1100_mtd_remove),
-        .shutdown       = sa1100_mtd_shutdown,
         .driver         = {
                 .name   = "sa1100-mtd",
                 .owner  = THIS_MODULE,