mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
usb: musb: Disable pullup at init
commit 96a0c12843
upstream.
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>
Cc: stable@vger.kernel.org
Signed-off-by: Bin Liu <b-liu@ti.com>
Link: https://lore.kernel.org/r/20200107152625.857-3-b-liu@ti.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
32199ac31d
commit
25eecc1f14
1 changed files with 3 additions and 0 deletions
|
@ -2318,6 +2318,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);
|
||||
|
|
Loading…
Reference in a new issue