Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f0607d authored by Felipe Balbi's avatar Felipe Balbi
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
parent a9031e5f

drivers/usb/host/ehci-omap.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -963,7 +963,7 @@ 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");
@@ -971,7 +971,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
		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");

drivers/usb/host/ohci-omap3.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -630,7 +630,7 @@ 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");
@@ -638,7 +638,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev) 
		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");