Commit db638c65 authored by Amelie Delaunay's avatar Amelie Delaunay Committed by Greg Kroah-Hartman
Browse files

usb: dwc2: gadget: remove D+ pull-up while no vbus with usb-role-switch 



When using usb-role-switch, D+ pull-up is set as soon as DTCL_SFTDISCON is
cleared, whatever the vbus valid signal state is. The pull-up should not
be set when vbus isn't present (this is determined by the drd controller).

This patch ensures that B-Session (so Peripheral role + vbus valid signal)
is valid before clearing the DCTL_SFTDISCON bit when role switch is used.
Keep original behavior when usb-role-switch isn't used.

Acked-by: default avatarMinas Harutyunyan <hminas@synopsys.com>
Signed-off-by: default avatarAmelie Delaunay <amelie.delaunay@foss.st.com>
Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/20220622160717.314580-1-fabrice.gasnier@foss.st.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21cdd6a0

drivers/usb/dwc2/gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -3594,6 +3594,7 @@ void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) 
void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg)

{

	/* remove the soft-disconnect and let's go */

	if (!hsotg->role_sw || (dwc2_readl(hsotg, GOTGCTL) & GOTGCTL_BSESVLD))

		dwc2_clear_bit(hsotg, DCTL, DCTL_SFTDISCON);

}