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.

1 files changed, 100 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c
new file mode 100644
index 000000000000..8a73814126b1
--- /dev/null
+++ b/arch/arm/mach-pxa/mp900.c
@@ -0,0 +1,100 @@
+/*
+ *  linux/arch/arm/mach-pxa/mp900.c
+ *
+ *  Support for the NEC MobilePro900/C platform
+ *
+ *  Based on mach-pxa/gumstix.c
+ *
+ *  2007, 2008 Kristoffer Ericson <kristoffer.ericson@gmail.com>
+ *  2007, 2008 Michael Petchkovsky <mkpetch@internode.on.net>
+ *
+ *  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/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+#include <linux/usb/isp116x.h>
+
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include "generic.h"
+
+static void isp116x_pfm_delay(struct device *dev, int delay)
+{
+
+        /* 400Mhz PXA2 = 2.5ns / instruction */
+
+        int cyc = delay / 10;
+
+        /* 4 Instructions = 4 x 2.5ns = 10ns */
+        __asm__ volatile ("0:\n"
+                "subs %0, %1, #1\n"
+                "bge 0b\n"
+                :"=r" (cyc)
+                :"0"(cyc)
+        );
+}
+
+static struct isp116x_platform_data isp116x_pfm_data = {
+        .remote_wakeup_enable = 1,
+        .delay = isp116x_pfm_delay,
+};
+
+static struct resource isp116x_pfm_resources[] = {
+        [0] =   {
+                .start  = 0x0d000000,
+                .end    = 0x0d000000 + 1,
+                .flags  = IORESOURCE_MEM,
+                },
+        [1] =   {
+                .start  = 0x0d000000 + 4,
+                .end    = 0x0d000000 + 5,
+                .flags  = IORESOURCE_MEM,
+                },
+        [2] =   {
+                .start  = 61,
+                .end    = 61,
+                .flags  = IORESOURCE_IRQ,
+                },
+};
+
+static struct platform_device mp900c_dummy_device = {
+        .name           = "mp900c_dummy",
+        .id             = -1,
+};
+
+static struct platform_device mp900c_usb = {
+        .name           = "isp116x-hcd",
+        .num_resources  = ARRAY_SIZE(isp116x_pfm_resources),
+        .resource       = isp116x_pfm_resources,
+        .dev.platform_data = &isp116x_pfm_data,
+};
+
+static struct platform_device *devices[] __initdata = {
+        &mp900c_dummy_device,
+        &mp900c_usb,
+};
+
+static void __init mp900c_init(void)
+{
+        printk(KERN_INFO "MobilePro 900/C machine init\n");
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+/* Maintainer - Michael Petchkovsky <mkpetch@internode.on.net> */
+MACHINE_START(NEC_MP900, "MobilePro900/C")
+        .phys_io        = 0x40000000,
+        .boot_params    = 0xa0220100,
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .timer          = &pxa_timer,
+        .map_io         = pxa_map_io,
+        .init_irq       = pxa25x_init_irq,
+        .init_machine   = mp900c_init,
+MACHINE_END
+