From: Kevin Hao <[email protected]> The DWC3_GUCTL_HSTINAUTORETRY has been deleted by stable commit a2d2fa661293 ("Revert "usb: dwc3: core: Enable AutoRetry feature in the controller""), but due to the merge conflict, we didn't delete all of them in the final code.
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following two branches: v5.15/standard/nxp-sdk-5.15/nxp-soc v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc drivers/usb/dwc3/core.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index d5ec930db5c7..0e5d348269cd 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -271,7 +271,6 @@ #define DWC3_GCTL_DSBLCLKGTNG BIT(0) /* Global User Control Register */ -#define DWC3_GUCTL_HSTINAUTORETRY BIT(14) #define DWC3_GUCTL_REFCLKPER_MASK GENMASK(31, 22) #define DWC3_GUCTL_REFCLKPER_SHIFT 22 -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12920): https://lists.yoctoproject.org/g/linux-yocto/message/12920 Mute This Topic: https://lists.yoctoproject.org/mt/100537799/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
