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
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mach-ebsa110/core.c
Simple merge

diff --cc arch/arm/mach-rpc/Makefile
index dfa405c0cfde10b356579c8fec842d76c98a301d,f89320739b09d7b605b835cbb4e0b1ca9e0e3188..992e28b4ae9a54ddab9ea92b2d0c92d6b303964e
--- 1/arch/arm/mach-rpc/Makefile
--- 2/arch/arm/mach-rpc/Makefile
+++ b/arch/arm/mach-rpc/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  
  # Object file lists.
  
- obj-y                 := dma.o fiq.o irq.o riscpc.o
 -obj-y                 := dma.o ecard.o irq.o riscpc.o time.o
++obj-y                 := dma.o ecard.o fiq.o irq.o riscpc.o time.o
  obj-m                 :=
  obj-n                 :=
  obj-                  :=

diff --cc arch/arm/mach-rpc/ecard.c
Simple merge

diff --cc arch/arm/mach-sa1100/generic.c
index 7c1ebf4a7920f140259b3da2896cd6bf6bef8081,b18470420d3ed6a0e262557d7e7d73878c782d9b..1d0f71b17a2670a9ac30aed6bcfc163bf810afc1
--- 1/arch/arm/mach-sa1100/generic.c
--- 2/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@@ -354,10 -308,31 +314,33 @@@ static struct resource sa1100_rtc_resou
  static struct platform_device sa11x0rtc_device = {
        .name           = "sa1100-rtc",
        .id             = -1,
 +      .num_resources  = ARRAY_SIZE(sa1100_rtc_resources),
 +      .resource       = sa1100_rtc_resources,
  };
  
+ static struct resource sa11x0dma_resources[] = {
+       DEFINE_RES_MEM(DMA_PHYS, DMA_SIZE),
+       DEFINE_RES_IRQ(IRQ_DMA0),
+       DEFINE_RES_IRQ(IRQ_DMA1),
+       DEFINE_RES_IRQ(IRQ_DMA2),
+       DEFINE_RES_IRQ(IRQ_DMA3),
+       DEFINE_RES_IRQ(IRQ_DMA4),
+       DEFINE_RES_IRQ(IRQ_DMA5),
+ };
+ 
+ static u64 sa11x0dma_dma_mask = DMA_BIT_MASK(32);
+ 
+ static struct platform_device sa11x0dma_device = {
+       .name           = "sa11x0-dma",
+       .id             = -1,
+       .dev = {
+               .dma_mask = &sa11x0dma_dma_mask,
+               .coherent_dma_mask = 0xffffffff,
+       },
+       .num_resources  = ARRAY_SIZE(sa11x0dma_resources),
+       .resource       = sa11x0dma_resources,
+ };
+ 
  static struct platform_device *sa11x0_devices[] __initdata = {
        &sa11x0udc_device,
        &sa11x0uart1_device,

diff --cc arch/arm/mach-sa1100/include/mach/shannon.h
index 019f857a79384a49222bc115c7d651108967d889,a0d1114c45edd8b9a3ab886c2aa2bbeadc1a3282..fff39e02b4965667d73ef6bde31a9dfb0ff7412a
--- 1/arch/arm/mach-sa1100/include/mach/shannon.h
--- 2/arch/arm/mach-sa1100/include/mach/shannon.h
+++ b/arch/arm/mach-sa1100/include/mach/shannon.h
@@@ -21,12 -21,16 +21,12 @@@
  #define SHANNON_GPIO_U3_RTS           GPIO_GPIO (19)  /* ?? */
  #define SHANNON_GPIO_U3_CTS           GPIO_GPIO (20)  /* ?? */
  #define SHANNON_GPIO_SENSE_12V                GPIO_GPIO (21)  /* Input, 12v flash unprotect detected */
- #define SHANNON_GPIO_DISP_EN          GPIO_GPIO (22)  /* out */
+ #define SHANNON_GPIO_DISP_EN          22              /* out */
  /* XXX GPIO 23 unaccounted for */
 -#define SHANNON_GPIO_EJECT_0          GPIO_GPIO (24)  /* in */
 -#define SHANNON_IRQ_GPIO_EJECT_0      IRQ_GPIO24
 -#define SHANNON_GPIO_EJECT_1          GPIO_GPIO (25)  /* in */
 -#define SHANNON_IRQ_GPIO_EJECT_1      IRQ_GPIO25
 -#define SHANNON_GPIO_RDY_0            GPIO_GPIO (26)  /* in */
 -#define SHANNON_IRQ_GPIO_RDY_0                IRQ_GPIO26
 -#define SHANNON_GPIO_RDY_1            GPIO_GPIO (27)  /* in */
 -#define SHANNON_IRQ_GPIO_RDY_1                IRQ_GPIO27
 +#define SHANNON_GPIO_EJECT_0          24              /* in */
 +#define SHANNON_GPIO_EJECT_1          25              /* in */
 +#define SHANNON_GPIO_RDY_0            26              /* in */
 +#define SHANNON_GPIO_RDY_1            27              /* in */
  
  /* MCP UCB codec GPIO pins... */
  

diff --cc arch/arm/mach-sa1100/pci-nanoengine.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/net/ethernet/smsc/smc91x.c
Simple merge

diff --cc drivers/pcmcia/sa1111_generic.c
Simple merge

diff --cc drivers/pcmcia/sa1111_neponset.c
Simple merge

diff --cc drivers/rtc/rtc-sa1100.c
index fa512ed420179738600c9eda0a0839565370c784,e8f1adde4d821cd6c36df785825c62fd36707a07..4940fa8c4e1002f913e7f3171d8cdc72bd5310fb
--- 1/drivers/rtc/rtc-sa1100.c
--- 2/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@@ -35,9 -32,9 +35,9 @@@
  #include <linux/bitops.h>
  
  #include <mach/hardware.h>
- #include <asm/irq.h>
+ #include <mach/irqs.h>
  
 -#ifdef CONFIG_ARCH_PXA
 +#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
  #include <mach/regs-rtc.h>
  #endif