Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/net/tcp.h

1 files changed, 75 insertions, 9 deletions

diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 06f55931620c..31f0cbea0caa 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -1,21 +1,21 @@
 /*
  * USB
  */
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
 #include <linux/usb/musb.h>
-#include <linux/usb/otg.h>
 
 #include <mach/common.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/cputype.h>
+#include <mach/usb.h>
 
-#define DAVINCI_USB_OTG_BASE 0x01C64000
+#define DAVINCI_USB_OTG_BASE    0x01c64000
+
+#define DA8XX_USB0_BASE         0x01e00000
+#define DA8XX_USB1_BASE         0x01e25000
 
 #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
 static struct musb_hdrc_eps_bits musb_eps[] = {
@@ -85,10 +85,10 @@ static struct platform_device usb_dev = {
         .num_resources  = ARRAY_SIZE(usb_resources),
 };
 
-void __init setup_usb(unsigned mA, unsigned potpgt_msec)
+void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
 {
-        usb_data.power = mA / 2;
-        usb_data.potpgt = potpgt_msec / 2;
+        usb_data.power = mA > 510 ? 255 : mA / 2;
+        usb_data.potpgt = (potpgt_ms + 1) / 2;
 
         if (cpu_is_davinci_dm646x()) {
                 /* Override the defaults as DM6467 uses different IRQs. */
@@ -100,11 +100,77 @@ void __init setup_usb(unsigned mA, unsigned potpgt_msec)
         platform_device_register(&usb_dev);
 }
 
+#ifdef CONFIG_ARCH_DAVINCI_DA8XX
+static struct resource da8xx_usb20_resources[] = {
+        {
+                .start          = DA8XX_USB0_BASE,
+                .end            = DA8XX_USB0_BASE + SZ_64K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = IRQ_DA8XX_USB_INT,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
+{
+        usb_data.clock  = "usb20";
+        usb_data.power  = mA > 510 ? 255 : mA / 2;
+        usb_data.potpgt = (potpgt + 1) / 2;
+
+        usb_dev.resource = da8xx_usb20_resources;
+        usb_dev.num_resources = ARRAY_SIZE(da8xx_usb20_resources);
+
+        return platform_device_register(&usb_dev);
+}
+#endif  /* CONFIG_DAVINCI_DA8XX */
+
 #else
 
-void __init setup_usb(unsigned mA, unsigned potpgt_msec)
+void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms)
 {
 }
 
+#ifdef CONFIG_ARCH_DAVINCI_DA8XX
+int __init da8xx_register_usb20(unsigned mA, unsigned potpgt)
+{
+        return 0;
+}
+#endif
+
 #endif  /* CONFIG_USB_MUSB_HDRC */
 
+#ifdef  CONFIG_ARCH_DAVINCI_DA8XX
+static struct resource da8xx_usb11_resources[] = {
+        [0] = {
+                .start  = DA8XX_USB1_BASE,
+                .end    = DA8XX_USB1_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_DA8XX_IRQN,
+                .end    = IRQ_DA8XX_IRQN,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static u64 da8xx_usb11_dma_mask = DMA_BIT_MASK(32);
+
+static struct platform_device da8xx_usb11_device = {
+        .name           = "ohci",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = &da8xx_usb11_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .num_resources  = ARRAY_SIZE(da8xx_usb11_resources),
+        .resource       = da8xx_usb11_resources,
+};
+
+int __init da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata)
+{
+        da8xx_usb11_device.dev.platform_data = pdata;
+        return platform_device_register(&da8xx_usb11_device);
+}
+#endif  /* CONFIG_DAVINCI_DA8XX */