Commit 98ed256a authored by John Stultz's avatar John Stultz Committed by Felipe Balbi
Browse files

usb: dwc3: Add support for role-switch-default-mode binding 



Support the new role-switch-default-mode binding for configuring
the default role the controller assumes as when the usb role is
USB_ROLE_NONE

This patch was split out from a larger patch originally by
Yu Chen <chenyu56@huawei.com>

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
CC: ShuFan Lee <shufan_lee@richtek.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>
Cc: Yu Chen <chenyu56@huawei.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Jun Li <lijun.kernel@gmail.com>
Cc: Valentin Schneider <valentin.schneider@arm.com>
Cc: Guillaume Gardet <Guillaume.Gardet@arm.com>
Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Jack Pham <jackp@codeaurora.org>
Cc: linux-usb@vger.kernel.org
Cc: devicetree@vger.kernel.org
Tested-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent dd2d0d1f

drivers/usb/dwc3/core.h

+3 −0
Original line number Diff line number Diff line
@@ -956,6 +956,8 @@ struct dwc3_scratchpad_array { 
 *		- USBPHY_INTERFACE_MODE_UTMI

 *		- USBPHY_INTERFACE_MODE_UTMIW

 * @role_sw: usb_role_switch handle

 * @role_switch_default_mode: default operation mode of controller while

 *			usb role is USB_ROLE_NONE.

 * @usb2_phy: pointer to USB2 PHY

 * @usb3_phy: pointer to USB3 PHY

 * @usb2_generic_phy: pointer to USB2 PHY
@@ -1092,6 +1094,7 @@ struct dwc3 { 
	struct notifier_block	edev_nb;

	enum usb_phy_interface	hsphy_mode;

	struct usb_role_switch	*role_sw;

	enum usb_dr_mode	role_switch_default_mode;



	u32			fladj;

	u32			irq_gadget;

drivers/usb/dwc3/drd.c

+22 −3
Original line number Diff line number Diff line
@@ -491,6 +491,9 @@ static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) 
		mode = DWC3_GCTL_PRTCAP_DEVICE;

		break;

	default:

		if (dwc->role_switch_default_mode == USB_DR_MODE_HOST)

			mode = DWC3_GCTL_PRTCAP_HOST;

		else

			mode = DWC3_GCTL_PRTCAP_DEVICE;

		break;

	}
@@ -517,6 +520,9 @@ static enum usb_role dwc3_usb_role_switch_get(struct device *dev) 
		role = dwc->current_otg_role;

		break;

	default:

		if (dwc->role_switch_default_mode == USB_DR_MODE_HOST)

			role = USB_ROLE_HOST;

		else

			role = USB_ROLE_DEVICE;

		break;

	}
@@ -527,6 +533,19 @@ static enum usb_role dwc3_usb_role_switch_get(struct device *dev) 
static int dwc3_setup_role_switch(struct dwc3 *dwc)

{

	struct usb_role_switch_desc dwc3_role_switch = {NULL};

	const char *str;

	u32 mode;

	int ret;



	ret = device_property_read_string(dwc->dev, "role-switch-default-mode",

					  &str);

	if (ret >= 0  && !strncmp(str, "host", strlen("host"))) {

		dwc->role_switch_default_mode = USB_DR_MODE_HOST;

		mode = DWC3_GCTL_PRTCAP_HOST;

	} else {

		dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL;

		mode = DWC3_GCTL_PRTCAP_DEVICE;

	}



	dwc3_role_switch.fwnode = dev_fwnode(dwc->dev);

	dwc3_role_switch.set = dwc3_usb_role_switch_set;
@@ -535,7 +554,7 @@ static int dwc3_setup_role_switch(struct dwc3 *dwc) 
	if (IS_ERR(dwc->role_sw))

		return PTR_ERR(dwc->role_sw);



	dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE);

	dwc3_set_mode(dwc, mode);

	return 0;

}

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE