From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
To: Greg KH <greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
Cc: Linux USB Mailing List
<linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Linux OMAP Mailing List
<linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Anand Gadiyar <gadiyar-l0cyMroinI0@public.gmane.org>,
Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
Subject: [patch-v2.6.39 11/19] usb: host: omap: switch to platform_get_resource_byname
Date: Tue, 1 Mar 2011 17:15:32 +0200 [thread overview]
Message-ID: <1298992540-5984-12-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1298992540-5984-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
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-l0cyMroinI0@public.gmane.org>
---
drivers/usb/host/ehci-omap.c | 6 +++---
drivers/usb/host/ohci-omap3.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index d7e223b..1527721 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)
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");
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index a37d599..32f56bb 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)
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");
--
1.7.4.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-03-01 15:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 15:15 [patch-v2.6.39 00/19] OMAP USB + MUSB patches Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 03/19] usb: musb: Idle path retention and offmode support for OMAP3 Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 04/19] usb: otg: TWL4030: Update the last_event variable Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 05/19] usb: otg: OMAP4430: Save/restore the context Felipe Balbi
[not found] ` <1298992540-5984-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2011-03-01 15:15 ` [patch-v2.6.39 01/19] usb: musb: gadget: fix list_head usage Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 02/19] usb: musb: Remove platform context save/restore API Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 06/19] usb: musb: OMAP4430: Power down the PHY during board init Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 07/19] usb: musb: OMAP3xxx: Fix device detection in otg & host mode Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 10/19] arm: omap: usb: host: add names to resources Felipe Balbi
2011-03-01 15:15 ` Felipe Balbi [this message]
2011-03-01 15:15 ` [patch-v2.6.39 13/19] arm: omap: usb: create common enums and structures for ehci and ohci Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 14/19] usb: host: omap: common usb host core driver Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 15/19] arm: omap: usb: usbhs core device initialization Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 16/19] arm: omap: usb: Invoke " Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 18/19] usb: host: omap: ehci and ohci simplification Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 08/19] usb: musb: tusb: Fix possible null pointer dereference in tusb6010_omap.c Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 09/19] usb: ehci: omap: add support for TLL mode on OMAP4 Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 12/19] arm: omap2: usb: rename usb-ehci.c to usb-host.c Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 17/19] arm: omap: usb: cleanup ehci and ohci resources and devices Felipe Balbi
2011-03-01 15:15 ` [patch-v2.6.39 19/19] arm: omap: usb: clock entries for omap3 and omap4 Felipe Balbi
2011-03-01 15:41 ` [patch-v2.6.39 00/19] OMAP USB + MUSB patches Greg KH
2011-03-01 15:42 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298992540-5984-12-git-send-email-balbi@ti.com \
--to=balbi-l0cymroini0@public.gmane.org \
--cc=gadiyar-l0cyMroinI0@public.gmane.org \
--cc=greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox