Unverified Commit 6703052f authored by Roger Quadros's avatar Roger Quadros Committed by Peter Chen
Browse files

usb: cdns3: Fix hardware based role switch 



Hardware based role switch is broken as the driver always skips it.
Fix this by registering for  SW role switch only if 'usb-role-switch'
property is present in the device tree.

Fixes: 50642709 ("usb: cdns3: core: quit if it uses role switch class")
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent f3bc432a

drivers/usb/cdns3/core.c

+15 −12
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ static irqreturn_t cdns3_wakeup_irq(int irq, void *data) 
 */

static int cdns3_probe(struct platform_device *pdev)

{

	struct usb_role_switch_desc sw_desc = { };

	struct device *dev = &pdev->dev;

	struct resource	*res;

	struct cdns3 *cdns;
@@ -529,11 +528,13 @@ static int cdns3_probe(struct platform_device *pdev) 
	if (ret)

		goto err2;



	if (device_property_read_bool(dev, "usb-role-switch")) {

		struct usb_role_switch_desc sw_desc = { };



		sw_desc.set = cdns3_role_set;

		sw_desc.get = cdns3_role_get;

		sw_desc.allow_userspace_control = true;

		sw_desc.driver_data = cdns;

	if (device_property_read_bool(dev, "usb-role-switch"))

		sw_desc.fwnode = dev->fwnode;



		cdns->role_sw = usb_role_switch_register(dev, &sw_desc);
@@ -542,6 +543,7 @@ static int cdns3_probe(struct platform_device *pdev) 
			dev_warn(dev, "Unable to register Role Switch\n");

			goto err3;

		}

	}



	if (cdns->wakeup_irq) {

		ret = devm_request_irq(cdns->dev, cdns->wakeup_irq,
@@ -582,6 +584,7 @@ static int cdns3_probe(struct platform_device *pdev) 
	return 0;

err4:

	cdns3_drd_exit(cdns);

	if (cdns->role_sw)

		usb_role_switch_unregister(cdns->role_sw);

err3:

	set_phy_power_off(cdns);

CRA Git | Maintained and supported by SUSTech CRA and CCSE