aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2011-03-01 09:38:14 -0500
committerFelipe Balbi <balbi@ti.com>2011-03-01 10:00:58 -0500
commit09f0607d8be62469a9b33034c8d3def9a5c7cbb7 (patch)
tree5b73bdcf3133ff598b7b059839e24630c2359266 /drivers
parenta9031e5f0b82225ea676d729d68beb6c69799a67 (diff)
usb: host: omap: switch to platform_get_resource_byname
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/ehci-omap.c6
-rw-r--r--drivers/usb/host/ohci-omap3.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index d7e223be1c9..15277213f92 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -947,7 +947,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
947 omap->ehci = hcd_to_ehci(hcd); 947 omap->ehci = hcd_to_ehci(hcd);
948 omap->ehci->sbrn = 0x20; 948 omap->ehci->sbrn = 0x20;
949 949
950 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 950 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ehci");
951 951
952 hcd->rsrc_start = res->start; 952 hcd->rsrc_start = res->start;
953 hcd->rsrc_len = resource_size(res); 953 hcd->rsrc_len = resource_size(res);
@@ -963,7 +963,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
963 omap->ehci->caps = hcd->regs; 963 omap->ehci->caps = hcd->regs;
964 omap->ehci_base = hcd->regs; 964 omap->ehci_base = hcd->regs;
965 965
966 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 966 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
967 omap->uhh_base = ioremap(res->start, resource_size(res)); 967 omap->uhh_base = ioremap(res->start, resource_size(res));
968 if (!omap->uhh_base) { 968 if (!omap->uhh_base) {
969 dev_err(&pdev->dev, "UHH ioremap failed\n"); 969 dev_err(&pdev->dev, "UHH ioremap failed\n");
@@ -971,7 +971,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
971 goto err_uhh_ioremap; 971 goto err_uhh_ioremap;
972 } 972 }
973 973
974 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 974 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
975 omap->tll_base = ioremap(res->start, resource_size(res)); 975 omap->tll_base = ioremap(res->start, resource_size(res));
976 if (!omap->tll_base) { 976 if (!omap->tll_base) {
977 dev_err(&pdev->dev, "TLL ioremap failed\n"); 977 dev_err(&pdev->dev, "TLL ioremap failed\n");
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index a37d5993e4e..32f56bbec21 100644
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -618,7 +618,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
618 omap->es2_compatibility = pdata->es2_compatibility; 618 omap->es2_compatibility = pdata->es2_compatibility;
619 omap->ohci = hcd_to_ohci(hcd); 619 omap->ohci = hcd_to_ohci(hcd);
620 620
621 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 621 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ohci");
622 622
623 hcd->rsrc_start = res->start; 623 hcd->rsrc_start = res->start;
624 hcd->rsrc_len = resource_size(res); 624 hcd->rsrc_len = resource_size(res);
@@ -630,7 +630,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
630 goto err_ioremap; 630 goto err_ioremap;
631 } 631 }
632 632
633 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 633 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
634 omap->uhh_base = ioremap(res->start, resource_size(res)); 634 omap->uhh_base = ioremap(res->start, resource_size(res));
635 if (!omap->uhh_base) { 635 if (!omap->uhh_base) {
636 dev_err(&pdev->dev, "UHH ioremap failed\n"); 636 dev_err(&pdev->dev, "UHH ioremap failed\n");
@@ -638,7 +638,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
638 goto err_uhh_ioremap; 638 goto err_uhh_ioremap;
639 } 639 }
640 640
641 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 641 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
642 omap->tll_base = ioremap(res->start, resource_size(res)); 642 omap->tll_base = ioremap(res->start, resource_size(res));
643 if (!omap->tll_base) { 643 if (!omap->tll_base) {
644 dev_err(&pdev->dev, "TLL ioremap failed\n"); 644 dev_err(&pdev->dev, "TLL ioremap failed\n");