hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/arm/mach-davinci/usb.c
....@@ -2,16 +2,16 @@
22 /*
33 * USB
44 */
5
+#include <linux/dma-mapping.h>
56 #include <linux/init.h>
67 #include <linux/platform_device.h>
7
-#include <linux/dma-mapping.h>
8
-
8
+#include <linux/platform_data/usb-davinci.h>
99 #include <linux/usb/musb.h>
1010
1111 #include <mach/common.h>
12
-#include <mach/irqs.h>
1312 #include <mach/cputype.h>
14
-#include <linux/platform_data/usb-davinci.h>
13
+
14
+#include "irqs.h"
1515
1616 #define DAVINCI_USB_OTG_BASE 0x01c64000
1717
....@@ -38,7 +38,7 @@
3838 .flags = IORESOURCE_MEM,
3939 },
4040 {
41
- .start = IRQ_USBINT,
41
+ .start = DAVINCI_INTC_IRQ(IRQ_USBINT),
4242 .flags = IORESOURCE_IRQ,
4343 .name = "mc"
4444 },
....@@ -70,8 +70,9 @@
7070
7171 if (cpu_is_davinci_dm646x()) {
7272 /* Override the defaults as DM6467 uses different IRQs. */
73
- usb_dev.resource[1].start = IRQ_DM646X_USBINT;
74
- usb_dev.resource[2].start = IRQ_DM646X_USBDMAINT;
73
+ usb_dev.resource[1].start = DAVINCI_INTC_IRQ(IRQ_DM646X_USBINT);
74
+ usb_dev.resource[2].start = DAVINCI_INTC_IRQ(
75
+ IRQ_DM646X_USBDMAINT);
7576 } else /* other devices don't have dedicated CPPI IRQ */
7677 usb_dev.num_resources = 2;
7778