aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2011-03-01 09:38:13 -0500
committerFelipe Balbi <balbi@ti.com>2011-03-01 10:00:57 -0500
commita9031e5f0b82225ea676d729d68beb6c69799a67 (patch)
treea11e158b4d9999c1ee30cd3db4427ad7a8a11e06 /arch
parent87ecc73b3d74ca70100e7100313c005fa471f177 (diff)
arm: omap: usb: host: add names to resources
add names to EHCI and OHCI resources. That will help us identify the resource correctly when moving to a setup where OHCI and EHCI play well together. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/usb-ehci.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index 25eeadabc39b..2c74fa171181 100644
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -350,6 +350,11 @@ void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
350 setup_4430ehci_io_mux(pdata->port_mode); 350 setup_4430ehci_io_mux(pdata->port_mode);
351 } 351 }
352 352
353 ehci_resources[0].name = "ehci";
354 ehci_resources[1].name = "uhh";
355 ehci_resources[2].name = "tll";
356 ehci_resources[3].name = "irq";
357
353 if (platform_device_register(&ehci_device) < 0) { 358 if (platform_device_register(&ehci_device) < 0) {
354 printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n"); 359 printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");
355 return; 360 return;
@@ -369,21 +374,25 @@ void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
369 374
370static struct resource ohci_resources[] = { 375static struct resource ohci_resources[] = {
371 { 376 {
377 .name = "ohci",
372 .start = OMAP34XX_OHCI_BASE, 378 .start = OMAP34XX_OHCI_BASE,
373 .end = OMAP34XX_OHCI_BASE + SZ_1K - 1, 379 .end = OMAP34XX_OHCI_BASE + SZ_1K - 1,
374 .flags = IORESOURCE_MEM, 380 .flags = IORESOURCE_MEM,
375 }, 381 },
376 { 382 {
383 .name = "uhh",
377 .start = OMAP34XX_UHH_CONFIG_BASE, 384 .start = OMAP34XX_UHH_CONFIG_BASE,
378 .end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1, 385 .end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,
379 .flags = IORESOURCE_MEM, 386 .flags = IORESOURCE_MEM,
380 }, 387 },
381 { 388 {
389 .name = "tll",
382 .start = OMAP34XX_USBTLL_BASE, 390 .start = OMAP34XX_USBTLL_BASE,
383 .end = OMAP34XX_USBTLL_BASE + SZ_4K - 1, 391 .end = OMAP34XX_USBTLL_BASE + SZ_4K - 1,
384 .flags = IORESOURCE_MEM, 392 .flags = IORESOURCE_MEM,
385 }, 393 },
386 { /* general IRQ */ 394 { /* general IRQ */
395 .name = "irq",
387 .start = INT_34XX_OHCI_IRQ, 396 .start = INT_34XX_OHCI_IRQ,
388 .flags = IORESOURCE_IRQ, 397 .flags = IORESOURCE_IRQ,
389 } 398 }