diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-10 21:27:55 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 10:01:36 +0100 |
| commit | 2c20b9f19add2248dc867f1f78dcef1eb0944543 (patch) | |
| tree | c7b6861e16bc9fb9d4d25cb4c5730e4509af5033 /arch/arm/mach-mx25/devices.c | |
| parent | e9f0bafb4f3d32d0bc0ea7e946d667a68bae59ce (diff) | |
ARM: mx25: dynamically allocate mxc-ehci devices
According to the reference manual of the i.MX25 the host controller uses an
offset of 0x200 not 0x400 as was specified in the resources for mxc_usbh2.
Needs-Testing: yes
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25/devices.c')
| -rw-r--r-- | arch/arm/mach-mx25/devices.c | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c index 92eb1a90b52..4611c763ff1 100644 --- a/arch/arm/mach-mx25/devices.c +++ b/arch/arm/mach-mx25/devices.c @@ -26,27 +26,16 @@ static u64 otg_dmamask = DMA_BIT_MASK(32); static struct resource mxc_otg_resources[] = { { - .start = MX25_OTG_BASE_ADDR, - .end = MX25_OTG_BASE_ADDR + 0x1ff, + .start = MX25_USB_OTG_BASE_ADDR, + .end = MX25_USB_OTG_BASE_ADDR + 0x1ff, .flags = IORESOURCE_MEM, }, { - .start = 37, - .end = 37, + .start = MX25_INT_USB_OTG, + .end = MX25_INT_USB_OTG, .flags = IORESOURCE_IRQ, }, }; -struct platform_device mxc_otg = { - .name = "mxc-ehci", - .id = 0, - .dev = { - .coherent_dma_mask = 0xffffffff, - .dma_mask = &otg_dmamask, - }, - .resource = mxc_otg_resources, - .num_resources = ARRAY_SIZE(mxc_otg_resources), -}; - /* OTG gadget device */ struct platform_device otg_udc_device = { .name = "fsl-usb2-udc", @@ -59,31 +48,6 @@ struct platform_device otg_udc_device = { .num_resources = ARRAY_SIZE(mxc_otg_resources), }; -static u64 usbh2_dmamask = DMA_BIT_MASK(32); - -static struct resource mxc_usbh2_resources[] = { - { - .start = MX25_OTG_BASE_ADDR + 0x400, - .end = MX25_OTG_BASE_ADDR + 0x5ff, - .flags = IORESOURCE_MEM, - }, { - .start = 35, - .end = 35, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device mxc_usbh2 = { - .name = "mxc-ehci", - .id = 1, - .dev = { - .coherent_dma_mask = 0xffffffff, - .dma_mask = &usbh2_dmamask, - }, - .resource = mxc_usbh2_resources, - .num_resources = ARRAY_SIZE(mxc_usbh2_resources), -}; - static struct resource mxc_pwm_resources0[] = { { .start = 0x53fe0000, |