* [PATCH] usb: add back otg_get_transceiver
@ 2008-10-03 14:15 Felipe Balbi
2008-10-03 14:31 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Felipe Balbi @ 2008-10-03 14:15 UTC (permalink / raw)
To: linux-omap; +Cc: Felipe Balbi
make twl4030_usb transceiver reach musb.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
drivers/usb/musb/omap2430.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 9d2dcb1..be4e779 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -215,12 +215,14 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
int __init musb_platform_init(struct musb *musb)
{
+ struct otg_transceiver *x = otg_get_transceiver();
u32 l;
#if defined(CONFIG_ARCH_OMAP2430)
omap_cfg_reg(AE5_2430_USB0HS_STP);
#endif
+ musb->xceiv = *x;
musb_platform_resume(musb);
l = omap_readl(OTG_SYSCONFIG);
--
1.6.0.2.307.gc427
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: add back otg_get_transceiver
2008-10-03 14:31 ` Tony Lindgren
@ 2008-10-03 14:30 ` Felipe Balbi
2008-10-03 20:04 ` Nathan Monson
1 sibling, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2008-10-03 14:30 UTC (permalink / raw)
To: ext Tony Lindgren; +Cc: Felipe Balbi, linux-omap
On Fri, Oct 03, 2008 at 05:31:34PM +0300, Tony Lindgren wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [081003 17:18]:
> > make twl4030_usb transceiver reach musb.
> >
> > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > ---
> > drivers/usb/musb/omap2430.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> > index 9d2dcb1..be4e779 100644
> > --- a/drivers/usb/musb/omap2430.c
> > +++ b/drivers/usb/musb/omap2430.c
> > @@ -215,12 +215,14 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
> >
> > int __init musb_platform_init(struct musb *musb)
> > {
> > + struct otg_transceiver *x = otg_get_transceiver();
> > u32 l;
> >
> > #if defined(CONFIG_ARCH_OMAP2430)
> > omap_cfg_reg(AE5_2430_USB0HS_STP);
> > #endif
> >
> > + musb->xceiv = *x;
> > musb_platform_resume(musb);
> >
> > l = omap_readl(OTG_SYSCONFIG);
>
> Pushed until you have something in mainline.
Will actually be kept... the change is that otg_get_transceiver will be
generic
--
balbi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: add back otg_get_transceiver
2008-10-03 14:15 [PATCH] usb: add back otg_get_transceiver Felipe Balbi
@ 2008-10-03 14:31 ` Tony Lindgren
2008-10-03 14:30 ` Felipe Balbi
2008-10-03 20:04 ` Nathan Monson
0 siblings, 2 replies; 5+ messages in thread
From: Tony Lindgren @ 2008-10-03 14:31 UTC (permalink / raw)
To: Felipe Balbi; +Cc: linux-omap
* Felipe Balbi <felipe.balbi@nokia.com> [081003 17:18]:
> make twl4030_usb transceiver reach musb.
>
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
> drivers/usb/musb/omap2430.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> index 9d2dcb1..be4e779 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -215,12 +215,14 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
>
> int __init musb_platform_init(struct musb *musb)
> {
> + struct otg_transceiver *x = otg_get_transceiver();
> u32 l;
>
> #if defined(CONFIG_ARCH_OMAP2430)
> omap_cfg_reg(AE5_2430_USB0HS_STP);
> #endif
>
> + musb->xceiv = *x;
> musb_platform_resume(musb);
>
> l = omap_readl(OTG_SYSCONFIG);
Pushed until you have something in mainline.
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: add back otg_get_transceiver
2008-10-03 14:31 ` Tony Lindgren
2008-10-03 14:30 ` Felipe Balbi
@ 2008-10-03 20:04 ` Nathan Monson
2008-10-03 23:56 ` Felipe Balbi
1 sibling, 1 reply; 5+ messages in thread
From: Nathan Monson @ 2008-10-03 20:04 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Felipe Balbi, linux-omap
On Fri, Oct 3, 2008 at 7:31 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [081003 17:18]:
>> make twl4030_usb transceiver reach musb.
>
> Pushed until you have something in mainline.
Now that this is in linux-omap git, my BeagleBoard no longer boots due
to a null dereference in musb_platform_init (*x).
Applying "i2c: change twl4030-usb back to subsys_initcall" from
earlier today allows the kernel to boot.
- Nathan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: add back otg_get_transceiver
2008-10-03 20:04 ` Nathan Monson
@ 2008-10-03 23:56 ` Felipe Balbi
0 siblings, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2008-10-03 23:56 UTC (permalink / raw)
To: Nathan Monson; +Cc: Tony Lindgren, Felipe Balbi, linux-omap
On Fri, Oct 03, 2008 at 01:04:27PM -0700, Nathan Monson wrote:
> On Fri, Oct 3, 2008 at 7:31 AM, Tony Lindgren <tony@atomide.com> wrote:
> > * Felipe Balbi <felipe.balbi@nokia.com> [081003 17:18]:
> >> make twl4030_usb transceiver reach musb.
> >
> > Pushed until you have something in mainline.
>
> Now that this is in linux-omap git, my BeagleBoard no longer boots due
> to a null dereference in musb_platform_init (*x).
>
> Applying "i2c: change twl4030-usb back to subsys_initcall" from
> earlier today allows the kernel to boot.
expected behavior without that patch applied. musb tries to get a
transceiver that doesn't exist yet since twl4030 is probing after musb.
--
balbi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-10-03 23:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-03 14:15 [PATCH] usb: add back otg_get_transceiver Felipe Balbi
2008-10-03 14:31 ` Tony Lindgren
2008-10-03 14:30 ` Felipe Balbi
2008-10-03 20:04 ` Nathan Monson
2008-10-03 23:56 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox