Skip to content

Commit

Permalink
usb: host: omap: switch to platform_get_resource_byname
Browse files Browse the repository at this point in the history 
now that we have names on all memory bases, we can
switch to use platform_get_resource_byname() which
will make it simpler when we move to a setup where
OHCI and EHCI on OMAP play well together.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 1, 2011
1 parent a9031e5 commit 09f0607
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/host/ehci-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
omap->ehci = hcd_to_ehci(hcd);
omap->ehci->sbrn = 0x20;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ehci");

hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);
Expand All @@ -963,15 +963,15 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
omap->ehci->caps = hcd->regs;
omap->ehci_base = hcd->regs;

res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
omap->uhh_base = ioremap(res->start, resource_size(res));
if (!omap->uhh_base) {
dev_err(&pdev->dev, "UHH ioremap failed\n");
ret = -ENOMEM;
goto err_uhh_ioremap;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
omap->tll_base = ioremap(res->start, resource_size(res));
if (!omap->tll_base) {
dev_err(&pdev->dev, "TLL ioremap failed\n");
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/host/ohci-omap3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
omap->es2_compatibility = pdata->es2_compatibility;
omap->ohci = hcd_to_ohci(hcd);

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ohci");

hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);
Expand All @@ -630,15 +630,15 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
goto err_ioremap;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
omap->uhh_base = ioremap(res->start, resource_size(res));
if (!omap->uhh_base) {
dev_err(&pdev->dev, "UHH ioremap failed\n");
ret = -ENOMEM;
goto err_uhh_ioremap;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
omap->tll_base = ioremap(res->start, resource_size(res));
if (!omap->tll_base) {
dev_err(&pdev->dev, "TLL ioremap failed\n");
Expand Down

0 comments on commit 09f0607

Please sign in to comment.