| Message ID | 20191214221815.97483-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 96a0c12843109e5c4d5eb1e09d915fdd0ce31d25 |
| Headers | show |
| Series | usb: musb: Disable pullup at init | expand |
On Sat, Dec 14, 2019 at 11:18:15PM +0100, Paul Cercueil wrote: > The pullup may be already enabled before the driver is initialized. This > happens for instance on JZ4740. > > It has to be disabled at init time, as we cannot guarantee that a gadget > driver will be bound to the UDC. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Suggested-by: Bin Liu <b-liu@ti.com> Applied. Thanks. -Bin.
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 15cca912c53e..c91d5c2ed4ad 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2310,6 +2310,9 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb_disable_interrupts(musb); musb_writeb(musb->mregs, MUSB_DEVCTL, 0); + /* MUSB_POWER_SOFTCONN might be already set, JZ4740 does this. */ + musb_writeb(musb->mregs, MUSB_POWER, 0); + /* Init IRQ workqueue before request_irq */ INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work); INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);
The pullup may be already enabled before the driver is initialized. This happens for instance on JZ4740. It has to be disabled at init time, as we cannot guarantee that a gadget driver will be bound to the UDC. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Suggested-by: Bin Liu <b-liu@ti.com> --- drivers/usb/musb/musb_core.c | 3 +++ 1 file changed, 3 insertions(+)