Commit 6ecd7749 authored by Bastien Curutchet's avatar Bastien Curutchet Committed by Greg Kroah-Hartman
Browse files

Revert "usb: musb: da8xx: Set phy in OTG mode by default" 



This reverts commit 7ccf6294.

da8xx_musb_set_mode() forces OTG mode regardless the selected mode even
if the property 'dr_mode = "host"' is present in device-tree. This
causes an unrecoverable error when VBUS supply is shut down : plugged
gadgets are no longer detected once VBUS supply is back.

Reverting it allows to have a selected mode coherent with device-tree's
description. IMO, this shouldn't cause regression because OTG mode is
the default selection when 'dr_mode' property is not set.

Signed-off-by: default avatarBastien Curutchet <bastien.curutchet@bootlin.com>
Link: https://lore.kernel.org/r/20240528102026.40136-3-bastien.curutchet@bootlin.com


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

drivers/usb/musb/da8xx.c

+0 −7
Original line number Diff line number Diff line
@@ -328,13 +328,6 @@ static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode) 
	struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent);

	enum phy_mode phy_mode;



	/*

	 * The PHY has some issues when it is forced in device or host mode.

	 * Unless the user request another mode, configure the PHY in OTG mode.

	 */

	if (!musb->is_initialized)

		return phy_set_mode(glue->phy, PHY_MODE_USB_OTG);



	switch (musb_mode) {

	case MUSB_HOST:		/* Force VBUS valid, ID = 0 */

		phy_mode = PHY_MODE_USB_HOST;