USB: sync MUSB driver core with mainline

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

drivers/usb/musb/cppi_dma.h

@@ -119,8 +119,8 @@ struct cppi {
 	void __iomem			*mregs;		/* Mentor regs */
 	void __iomem			*tibase;	/* TI/CPPI regs */
 
-	struct cppi_channel		tx[4];
-	struct cppi_channel		rx[4];
+	struct cppi_channel		tx[MUSB_C_NUM_EPT - 1];
+	struct cppi_channel		rx[MUSB_C_NUM_EPR - 1];
 
 	struct dma_pool			*pool;
 

drivers/usb/musb/davinci.c

@@ -31,15 +31,15 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <asm/memory.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/memory.h>
+#include <asm/arch/gpio.h>
 #include <asm/mach-types.h>
 
 #include "musb_core.h"
 
 #ifdef CONFIG_MACH_DAVINCI_EVM
-#include <mach/i2c-client.h>
+#include <asm/arch/i2c-client.h>
 #endif
 
 #include "davinci.h"

drivers/usb/musb/musb_core.c

@@ -100,8 +100,8 @@
 #include <linux/io.h>
 
 #ifdef	CONFIG_ARM
-#include <mach/hardware.h>
-#include <asm/memory.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/memory.h>
 #include <asm/mach-types.h>
 #endif
 

drivers/usb/musb/omap2430.c

@@ -35,8 +35,8 @@
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/mux.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/mux.h>
 
 #include "musb_core.h"
 #include "omap2430.h"

drivers/usb/musb/omap2430.h

@@ -11,8 +11,8 @@
 #define __MUSB_OMAP243X_H__
 
 #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
-#include <mach/hardware.h>
-#include <mach/usb.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/usb.h>
 
 /*
  * OMAP2430-specific definitions

drivers/usb/musb/tusb6010_omap.c

@@ -15,8 +15,8 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <mach/dma.h>
-#include <mach/mux.h>
+#include <asm/arch/dma.h>
+#include <asm/arch/mux.h>
 
 #include "musb_core.h"