diff options
| -rw-r--r-- | payloads/libpayload/drivers/udc/dwc2.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/payloads/libpayload/drivers/udc/dwc2.c b/payloads/libpayload/drivers/udc/dwc2.c index 99ee0b323b..ab3684448d 100644 --- a/payloads/libpayload/drivers/udc/dwc2.c +++ b/payloads/libpayload/drivers/udc/dwc2.c @@ -675,12 +675,29 @@ static int dwc2_check_irq(struct usbdev_ctrl *this) return 1; } +static void dwc2_force_shutdown(struct usbdev_ctrl *this) +{ + gusbcfg_t gusbcfg; + dwc2_pdata_t *p = DWC2_PDATA(this); + + /* Disconnect */ + dwc2_connect(this, 0); + + /* Back to normal otg mode */ + gusbcfg.d32 = readl(&p->regs->core.gusbcfg); + gusbcfg.forcehstmode = 0; + gusbcfg.forcedevmode = 0; + writel(gusbcfg.d32, &p->regs->core.gusbcfg); + + free(p); + free(this); +} + static void dwc2_shutdown(struct usbdev_ctrl *this) { dwc2_pdata_t *p = DWC2_PDATA(this); int i, j; int is_empty = 0; - gusbcfg_t gusbcfg; while (!is_empty) { is_empty = 1; @@ -691,17 +708,7 @@ static void dwc2_shutdown(struct usbdev_ctrl *this) is_empty = 0; } - /* Disconnect */ - dwc2_connect(this, 0); - - /* Back to normal otg mode */ - gusbcfg.d32 = readl(&p->regs->core.gusbcfg); - gusbcfg.forcehstmode = 0; - gusbcfg.forcedevmode = 0; - writel(gusbcfg.d32, &p->regs->core.gusbcfg); - - free(p); - free(this); + dwc2_force_shutdown(this); } static void dwc2_set_address(struct usbdev_ctrl *this, int address) @@ -910,6 +917,7 @@ struct usbdev_ctrl *dwc2_udc_init(device_descriptor_t *dd) ctrl->poll = dwc2_check_irq; ctrl->add_gadget = udc_add_gadget; ctrl->enqueue_packet = dwc2_enqueue_packet; + ctrl->force_shutdown = dwc2_force_shutdown; ctrl->shutdown = dwc2_shutdown; ctrl->set_address = dwc2_set_address; ctrl->stall = dwc2_stall; |