Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da9ad76 authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: dwc3: Use the correct speed macros for DSTS/DCFG 



Correct the use of the DWC3_DSTS_XXX_SPEED and DWC3_DCFG_XXX_SPEED
macros. The wrong set of macros were being used in a few places.

This is only a cosmetic change as the values for both sets are
identical.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 3de2685f

drivers/usb/dwc3/gadget.c

+12 −12
Original line number Diff line number Diff line
@@ -1672,16 +1672,16 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) 
	} else {

		switch (dwc->maximum_speed) {

		case USB_SPEED_LOW:

			reg |= DWC3_DSTS_LOWSPEED;

			reg |= DWC3_DCFG_LOWSPEED;

			break;

		case USB_SPEED_FULL:

			reg |= DWC3_DSTS_FULLSPEED1;

			reg |= DWC3_DCFG_FULLSPEED1;

			break;

		case USB_SPEED_HIGH:

			reg |= DWC3_DSTS_HIGHSPEED;

			reg |= DWC3_DCFG_HIGHSPEED;

			break;

		case USB_SPEED_SUPER_PLUS:

			reg |= DWC3_DSTS_SUPERSPEED_PLUS;

			reg |= DWC3_DCFG_SUPERSPEED_PLUS;

			break;

		default:

			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);



	switch (speed) {

	case DWC3_DCFG_SUPERSPEED_PLUS:

	case DWC3_DSTS_SUPERSPEED_PLUS:

		dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);

		dwc->gadget.ep0->maxpacket = 512;

		dwc->gadget.speed = USB_SPEED_SUPER_PLUS;

		break;

	case DWC3_DCFG_SUPERSPEED:

	case DWC3_DSTS_SUPERSPEED:

		/*

		 * WORKAROUND: DWC3 revisions <1.90a have an issue which

		 * 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.speed = USB_SPEED_SUPER;

		break;

	case DWC3_DCFG_HIGHSPEED:

	case DWC3_DSTS_HIGHSPEED:

		dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(64);

		dwc->gadget.ep0->maxpacket = 64;

		dwc->gadget.speed = USB_SPEED_HIGH;

		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);

		dwc->gadget.ep0->maxpacket = 64;

		dwc->gadget.speed = USB_SPEED_FULL;

		break;

	case DWC3_DCFG_LOWSPEED:

	case DWC3_DSTS_LOWSPEED:

		dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(8);

		dwc->gadget.ep0->maxpacket = 8;

		dwc->gadget.speed = USB_SPEED_LOW;
@@ -2506,8 +2506,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) 
	/* Enable USB2 LPM Capability */



	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_DCFG_LPM_CAP;

		dwc3_writel(dwc->regs, DWC3_DCFG, reg);