| Message ID | 1405675890-8802-7-git-send-email-LW@KARO-electronics.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 18, 2014 at 11:31:27AM +0200, Lothar Waßmann wrote: > Without this patch overriding the USBOTG_ID pin by setting the iddig > bit in the USB_MODE register doesn't work because it happens too late > to be recognized correctly. and how did you test this ? Why is it too late ? What was your setup when testing this ? > Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > --- > drivers/usb/musb/musb_core.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c > index f867b44..bbf2aefb 100644 > --- a/drivers/usb/musb/musb_core.c > +++ b/drivers/usb/musb/musb_core.c > @@ -1988,18 +1988,21 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) > > switch (musb->port_mode) { > case MUSB_PORT_MODE_HOST: > - status = musb_host_setup(musb, plat->power); > + status = musb_platform_set_mode(musb, MUSB_HOST); > if (status < 0) > goto fail3; > - status = musb_platform_set_mode(musb, MUSB_HOST); > + status = musb_host_setup(musb, plat->power); > break; > case MUSB_PORT_MODE_GADGET: > - status = musb_gadget_setup(musb); > + status = musb_platform_set_mode(musb, MUSB_PERIPHERAL); > if (status < 0) > goto fail3; > - status = musb_platform_set_mode(musb, MUSB_PERIPHERAL); > + status = musb_gadget_setup(musb); > break; > case MUSB_PORT_MODE_DUAL_ROLE: > + status = musb_platform_set_mode(musb, MUSB_OTG); > + if (status < 0) > + goto fail3; > status = musb_host_setup(musb, plat->power); > if (status < 0) > goto fail3; > @@ -2008,7 +2011,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) > musb_host_cleanup(musb); > goto fail3; > } > - status = musb_platform_set_mode(musb, MUSB_OTG); > break; > default: > dev_err(dev, "unsupported port mode %d\n", musb->port_mode); > -- > 1.7.10.4 >
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index f867b44..bbf2aefb 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1988,18 +1988,21 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) switch (musb->port_mode) { case MUSB_PORT_MODE_HOST: - status = musb_host_setup(musb, plat->power); + status = musb_platform_set_mode(musb, MUSB_HOST); if (status < 0) goto fail3; - status = musb_platform_set_mode(musb, MUSB_HOST); + status = musb_host_setup(musb, plat->power); break; case MUSB_PORT_MODE_GADGET: - status = musb_gadget_setup(musb); + status = musb_platform_set_mode(musb, MUSB_PERIPHERAL); if (status < 0) goto fail3; - status = musb_platform_set_mode(musb, MUSB_PERIPHERAL); + status = musb_gadget_setup(musb); break; case MUSB_PORT_MODE_DUAL_ROLE: + status = musb_platform_set_mode(musb, MUSB_OTG); + if (status < 0) + goto fail3; status = musb_host_setup(musb, plat->power); if (status < 0) goto fail3; @@ -2008,7 +2011,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb_host_cleanup(musb); goto fail3; } - status = musb_platform_set_mode(musb, MUSB_OTG); break; default: dev_err(dev, "unsupported port mode %d\n", musb->port_mode);
Without this patch overriding the USBOTG_ID pin by setting the iddig bit in the USB_MODE register doesn't work because it happens too late to be recognized correctly. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> --- drivers/usb/musb/musb_core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)