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

Commit 1ee6903b authored by Gregory Herrero's avatar Gregory Herrero Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: unmask idstschng interrupt only if controller supports it 



idstschng interrupt should not be used when id pin control is
external. This is already handled on dwc2 host part. Fix it on gadget
part as well.

Signed-off-by: default avatarGregory Herrero <gregory.herrero@intel.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Tested-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Tested-by: default avatarJohn Youn <johnyoun@synopsys.com>
Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 2becdc62

drivers/usb/dwc2/gadget.c

+10 −7
Original line number Diff line number Diff line
@@ -2285,6 +2285,7 @@ static int dwc2_hsotg_corereset(struct dwc2_hsotg *hsotg) 
void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,

						bool is_usb_reset)

{

	u32 intmsk;

	u32 val;



	/* Kill any ep0 requests as controller will be reinitialized */
@@ -2316,14 +2317,16 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, 


	/* Clear any pending interrupts */

	dwc2_writel(0xffffffff, hsotg->regs + GINTSTS);



	dwc2_writel(GINTSTS_ERLYSUSP | GINTSTS_SESSREQINT |

	intmsk = GINTSTS_ERLYSUSP | GINTSTS_SESSREQINT |

		GINTSTS_GOUTNAKEFF | GINTSTS_GINNAKEFF |

		GINTSTS_CONIDSTSCHNG | GINTSTS_USBRST |

		GINTSTS_RESETDET | GINTSTS_ENUMDONE |

		GINTSTS_OTGINT | GINTSTS_USBSUSP |

		GINTSTS_WKUPINT,

		hsotg->regs + GINTMSK);

		GINTSTS_USBRST | GINTSTS_RESETDET |

		GINTSTS_ENUMDONE | GINTSTS_OTGINT |

		GINTSTS_USBSUSP | GINTSTS_WKUPINT;



	if (hsotg->core_params->external_id_pin_ctl <= 0)

		intmsk |= GINTSTS_CONIDSTSCHNG;



	dwc2_writel(intmsk, hsotg->regs + GINTMSK);



	if (using_dma(hsotg))

		dwc2_writel(GAHBCFG_GLBL_INTR_EN | GAHBCFG_DMA_EN |