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 10/19] arm: omap: usb: host: add names to resources
Date: Tue, 1 Mar 2011 17:15:31 +0200 [thread overview]
Message-ID: <1298992540-5984-11-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1298992540-5984-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
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-l0cyMroinI0@public.gmane.org>
---
arch/arm/mach-omap2/usb-ehci.c | 9 +++++++++
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 25eeada..2c74fa1 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)
setup_4430ehci_io_mux(pdata->port_mode);
}
+ ehci_resources[0].name = "ehci";
+ ehci_resources[1].name = "uhh";
+ ehci_resources[2].name = "tll";
+ ehci_resources[3].name = "irq";
+
if (platform_device_register(&ehci_device) < 0) {
printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");
return;
@@ -369,21 +374,25 @@ void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
static struct resource ohci_resources[] = {
{
+ .name = "ohci",
.start = OMAP34XX_OHCI_BASE,
.end = OMAP34XX_OHCI_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
{
+ .name = "uhh",
.start = OMAP34XX_UHH_CONFIG_BASE,
.end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
{
+ .name = "tll",
.start = OMAP34XX_USBTLL_BASE,
.end = OMAP34XX_USBTLL_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
{ /* general IRQ */
+ .name = "irq",
.start = INT_34XX_OHCI_IRQ,
.flags = IORESOURCE_IRQ,
}
--
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
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
[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 ` Felipe Balbi [this message]
2011-03-01 15:15 ` [patch-v2.6.39 11/19] usb: host: omap: switch to platform_get_resource_byname Felipe Balbi
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 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-11-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