| .. | .. |
|---|
| 2 | 2 | /* |
|---|
| 3 | 3 | * USB |
|---|
| 4 | 4 | */ |
|---|
| 5 | +#include <linux/dma-mapping.h> |
|---|
| 5 | 6 | #include <linux/init.h> |
|---|
| 6 | 7 | #include <linux/platform_device.h> |
|---|
| 7 | | -#include <linux/dma-mapping.h> |
|---|
| 8 | | - |
|---|
| 8 | +#include <linux/platform_data/usb-davinci.h> |
|---|
| 9 | 9 | #include <linux/usb/musb.h> |
|---|
| 10 | 10 | |
|---|
| 11 | 11 | #include <mach/common.h> |
|---|
| 12 | | -#include <mach/irqs.h> |
|---|
| 13 | 12 | #include <mach/cputype.h> |
|---|
| 14 | | -#include <linux/platform_data/usb-davinci.h> |
|---|
| 13 | + |
|---|
| 14 | +#include "irqs.h" |
|---|
| 15 | 15 | |
|---|
| 16 | 16 | #define DAVINCI_USB_OTG_BASE 0x01c64000 |
|---|
| 17 | 17 | |
|---|
| .. | .. |
|---|
| 38 | 38 | .flags = IORESOURCE_MEM, |
|---|
| 39 | 39 | }, |
|---|
| 40 | 40 | { |
|---|
| 41 | | - .start = IRQ_USBINT, |
|---|
| 41 | + .start = DAVINCI_INTC_IRQ(IRQ_USBINT), |
|---|
| 42 | 42 | .flags = IORESOURCE_IRQ, |
|---|
| 43 | 43 | .name = "mc" |
|---|
| 44 | 44 | }, |
|---|
| .. | .. |
|---|
| 70 | 70 | |
|---|
| 71 | 71 | if (cpu_is_davinci_dm646x()) { |
|---|
| 72 | 72 | /* 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); |
|---|
| 75 | 76 | } else /* other devices don't have dedicated CPPI IRQ */ |
|---|
| 76 | 77 | usb_dev.num_resources = 2; |
|---|
| 77 | 78 | |
|---|