Commit ade23d7b authored by Quentin Schulz's avatar Quentin Schulz Committed by Greg Kroah-Hartman
Browse files

usb: dwc2: power on/off phy for peripheral mode in dual-role mode 



The PHY power is handled for peripheral mode but only when the device is
forced into this peripheral mode. It is missing when the device is
operating in peripheral mode when dual-role mode is enabled, so let's
update the condition to match this scenario.

Signed-off-by: default avatarQuentin Schulz <quentin.schulz@theobroma-systems.com>
Link: https://lore.kernel.org/r/20221206-dwc2-gadget-dual-role-v1-2-36515e1092cd@theobroma-systems.com


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

drivers/usb/dwc2/gadget.c

+4 −2
Original line number Diff line number Diff line
@@ -4549,7 +4549,8 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, 
	hsotg->gadget.dev.of_node = hsotg->dev->of_node;

	hsotg->gadget.speed = USB_SPEED_UNKNOWN;



	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) {

	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||

	    (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg))) {

		ret = dwc2_lowlevel_hw_enable(hsotg);

		if (ret)

			goto err;
@@ -4611,7 +4612,8 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget) 
	if (!IS_ERR_OR_NULL(hsotg->uphy))

		otg_set_peripheral(hsotg->uphy->otg, NULL);



	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)

	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||

	    (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg)))

		dwc2_lowlevel_hw_disable(hsotg);



	return 0;

drivers/usb/dwc2/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	dwc2_debugfs_init(hsotg);



	/* Gadget code manages lowlevel hw on its own */

	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)

	if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||

	    (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg)))

		dwc2_lowlevel_hw_disable(hsotg);



#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \