|
@@ -1672,16 +1672,16 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)
|
|
} else {
|
|
} else {
|
|
switch (dwc->maximum_speed) {
|
|
switch (dwc->maximum_speed) {
|
|
case USB_SPEED_LOW:
|
|
case USB_SPEED_LOW:
|
|
- reg |= DWC3_DSTS_LOWSPEED;
|
|
|
|
|
|
+ reg |= DWC3_DCFG_LOWSPEED;
|
|
break;
|
|
break;
|
|
case USB_SPEED_FULL:
|
|
case USB_SPEED_FULL:
|
|
- reg |= DWC3_DSTS_FULLSPEED1;
|
|
|
|
|
|
+ reg |= DWC3_DCFG_FULLSPEED1;
|
|
break;
|
|
break;
|
|
case USB_SPEED_HIGH:
|
|
case USB_SPEED_HIGH:
|
|
- reg |= DWC3_DSTS_HIGHSPEED;
|
|
|
|
|
|
+ reg |= DWC3_DCFG_HIGHSPEED;
|
|
break;
|
|
break;
|
|
case USB_SPEED_SUPER_PLUS:
|
|
case USB_SPEED_SUPER_PLUS:
|
|
- reg |= DWC3_DSTS_SUPERSPEED_PLUS;
|
|
|
|
|
|
+ reg |= DWC3_DCFG_SUPERSPEED_PLUS;
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
dev_err(dwc->dev, "invalid dwc->maximum_speed (%d)\n",
|
|
dev_err(dwc->dev, "invalid dwc->maximum_speed (%d)\n",
|
|
@@ -2459,12 +2459,12 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
|
|
dwc3_update_ram_clk_sel(dwc, speed);
|
|
dwc3_update_ram_clk_sel(dwc, speed);
|
|
|
|
|
|
switch (speed) {
|
|
switch (speed) {
|
|
- case DWC3_DCFG_SUPERSPEED_PLUS:
|
|
|
|
|
|
+ case DWC3_DSTS_SUPERSPEED_PLUS:
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
|
|
dwc->gadget.ep0->maxpacket = 512;
|
|
dwc->gadget.ep0->maxpacket = 512;
|
|
dwc->gadget.speed = USB_SPEED_SUPER_PLUS;
|
|
dwc->gadget.speed = USB_SPEED_SUPER_PLUS;
|
|
break;
|
|
break;
|
|
- case DWC3_DCFG_SUPERSPEED:
|
|
|
|
|
|
+ case DWC3_DSTS_SUPERSPEED:
|
|
/*
|
|
/*
|
|
* WORKAROUND: DWC3 revisions <1.90a have an issue which
|
|
* WORKAROUND: DWC3 revisions <1.90a have an issue which
|
|
* would cause a missing USB3 Reset event.
|
|
* would cause a missing USB3 Reset event.
|
|
@@ -2485,18 +2485,18 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
|
|
dwc->gadget.ep0->maxpacket = 512;
|
|
dwc->gadget.ep0->maxpacket = 512;
|
|
dwc->gadget.speed = USB_SPEED_SUPER;
|
|
dwc->gadget.speed = USB_SPEED_SUPER;
|
|
break;
|
|
break;
|
|
- case DWC3_DCFG_HIGHSPEED:
|
|
|
|
|
|
+ case DWC3_DSTS_HIGHSPEED:
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
|
|
dwc->gadget.ep0->maxpacket = 64;
|
|
dwc->gadget.ep0->maxpacket = 64;
|
|
dwc->gadget.speed = USB_SPEED_HIGH;
|
|
dwc->gadget.speed = USB_SPEED_HIGH;
|
|
break;
|
|
break;
|
|
- case DWC3_DCFG_FULLSPEED2:
|
|
|
|
- case DWC3_DCFG_FULLSPEED1:
|
|
|
|
|
|
+ case DWC3_DSTS_FULLSPEED2:
|
|
|
|
+ case DWC3_DSTS_FULLSPEED1:
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);
|
|
dwc->gadget.ep0->maxpacket = 64;
|
|
dwc->gadget.ep0->maxpacket = 64;
|
|
dwc->gadget.speed = USB_SPEED_FULL;
|
|
dwc->gadget.speed = USB_SPEED_FULL;
|
|
break;
|
|
break;
|
|
- case DWC3_DCFG_LOWSPEED:
|
|
|
|
|
|
+ case DWC3_DSTS_LOWSPEED:
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(8);
|
|
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(8);
|
|
dwc->gadget.ep0->maxpacket = 8;
|
|
dwc->gadget.ep0->maxpacket = 8;
|
|
dwc->gadget.speed = USB_SPEED_LOW;
|
|
dwc->gadget.speed = USB_SPEED_LOW;
|
|
@@ -2506,8 +2506,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
|
|
/* Enable USB2 LPM Capability */
|
|
/* Enable USB2 LPM Capability */
|
|
|
|
|
|
if ((dwc->revision > DWC3_REVISION_194A) &&
|
|
if ((dwc->revision > DWC3_REVISION_194A) &&
|
|
- (speed != DWC3_DCFG_SUPERSPEED) &&
|
|
|
|
- (speed != DWC3_DCFG_SUPERSPEED_PLUS)) {
|
|
|
|
|
|
+ (speed != DWC3_DSTS_SUPERSPEED) &&
|
|
|
|
+ (speed != DWC3_DSTS_SUPERSPEED_PLUS)) {
|
|
reg = dwc3_readl(dwc->regs, DWC3_DCFG);
|
|
reg = dwc3_readl(dwc->regs, DWC3_DCFG);
|
|
reg |= DWC3_DCFG_LPM_CAP;
|
|
reg |= DWC3_DCFG_LPM_CAP;
|
|
dwc3_writel(dwc->regs, DWC3_DCFG, reg);
|
|
dwc3_writel(dwc->regs, DWC3_DCFG, reg);
|