Commit 9ce0a14b authored by Nagarjuna Kristam's avatar Nagarjuna Kristam Committed by Thierry Reding
Browse files

usb: gadget: tegra-xudc: Remove usb-role-switch support 



Padctl driver will act as a central driver to receive USB role changes via
usb-role-switch. This is updated to corresponding host, device drivers.
Hence remove usb-role-switch from XUDC driver.

Signed-off-by: default avatarNagarjuna Kristam <nkristam@nvidia.com>
Acked-by: default avatarFelipe Balbi <balbi@kernel.org>
[treding@nvidia.com: rebase onto Greg's usb-next branch]
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f836e784

drivers/usb/gadget/udc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ config USB_TEGRA_XUDC 
	tristate "NVIDIA Tegra Superspeed USB 3.0 Device Controller"

	depends on ARCH_TEGRA || COMPILE_TEST

	depends on PHY_TEGRA_XUSB

	select USB_ROLE_SWITCH

	help

	 Enables NVIDIA Tegra USB 3.0 device mode controller driver.

drivers/usb/gadget/udc/tegra-xudc.c

+7 −53
Original line number Diff line number Diff line
@@ -477,8 +477,7 @@ struct tegra_xudc { 


	struct clk_bulk_data *clks;



	enum usb_role device_mode;

	struct usb_role_switch *usb_role_sw;

	bool device_mode;

	struct work_struct usb_role_sw_work;



	struct phy *usb3_phy;
@@ -609,8 +608,6 @@ static void tegra_xudc_device_mode_on(struct tegra_xudc *xudc) 
	dev_dbg(xudc->dev, "device mode on\n");



	tegra_xusb_padctl_set_vbus_override(xudc->padctl, true);



	xudc->device_mode = USB_ROLE_DEVICE;

}



static void tegra_xudc_device_mode_off(struct tegra_xudc *xudc)
@@ -643,8 +640,6 @@ static void tegra_xudc_device_mode_off(struct tegra_xudc *xudc) 
		xudc_writel(xudc, val, PORTSC);

	}



	xudc->device_mode = USB_ROLE_NONE;



	/* Wait for disconnect event. */

	if (connected)

		wait_for_completion(&xudc->disconnect_complete);
@@ -668,30 +663,10 @@ static void tegra_xudc_usb_role_sw_work(struct work_struct *work) 
	struct tegra_xudc *xudc = container_of(work, struct tegra_xudc,

					       usb_role_sw_work);



	if (!xudc->usb_role_sw ||

		usb_role_switch_get_role(xudc->usb_role_sw) == USB_ROLE_DEVICE)

	if (xudc->device_mode)

		tegra_xudc_device_mode_on(xudc);

	else

		tegra_xudc_device_mode_off(xudc);



}



static int tegra_xudc_usb_role_sw_set(struct usb_role_switch *sw,

				      enum usb_role role)

{

	struct tegra_xudc *xudc = usb_role_switch_get_drvdata(sw);

	unsigned long flags;



	dev_dbg(xudc->dev, "%s role is %d\n", __func__, role);



	spin_lock_irqsave(&xudc->lock, flags);



	if (!xudc->suspended)

		schedule_work(&xudc->usb_role_sw_work);



	spin_unlock_irqrestore(&xudc->lock, flags);



	return 0;

}



static void tegra_xudc_plc_reset_work(struct work_struct *work)
@@ -730,8 +705,7 @@ static void tegra_xudc_port_reset_war_work(struct work_struct *work) 


	spin_lock_irqsave(&xudc->lock, flags);



	if ((xudc->device_mode == USB_ROLE_DEVICE)

			      && xudc->wait_for_sec_prc) {

	if (xudc->device_mode && xudc->wait_for_sec_prc) {

		pls = (xudc_readl(xudc, PORTSC) & PORTSC_PLS_MASK) >>

			PORTSC_PLS_SHIFT;

		dev_dbg(xudc->dev, "pls = %x\n", pls);
@@ -3458,7 +3432,6 @@ static int tegra_xudc_probe(struct platform_device *pdev) 
{

	struct tegra_xudc *xudc;

	struct resource *res;

	struct usb_role_switch_desc role_sx_desc = { 0 };

	unsigned int i;

	int err;
@@ -3585,24 +3558,9 @@ static int tegra_xudc_probe(struct platform_device *pdev) 
	INIT_DELAYED_WORK(&xudc->port_reset_war_work,

				tegra_xudc_port_reset_war_work);



	if (of_property_read_bool(xudc->dev->of_node, "usb-role-switch")) {

		role_sx_desc.set = tegra_xudc_usb_role_sw_set;

		role_sx_desc.fwnode = dev_fwnode(xudc->dev);

		role_sx_desc.driver_data = xudc;



		xudc->usb_role_sw = usb_role_switch_register(xudc->dev,

							&role_sx_desc);

		if (IS_ERR(xudc->usb_role_sw)) {

			err = PTR_ERR(xudc->usb_role_sw);

			dev_err(xudc->dev, "Failed to register USB role SW: %d",

					   err);

			goto free_eps;

		}

	} else {

	/* Set the mode as device mode and this keeps phy always ON */

		dev_info(xudc->dev, "Set usb role to device mode always");

	xudc->device_mode = true;

	schedule_work(&xudc->usb_role_sw_work);

	}



	pm_runtime_enable(&pdev->dev);
@@ -3642,11 +3600,7 @@ static int tegra_xudc_remove(struct platform_device *pdev) 
	pm_runtime_get_sync(xudc->dev);



	cancel_delayed_work(&xudc->plc_reset_work);



	if (xudc->usb_role_sw) {

		usb_role_switch_unregister(xudc->usb_role_sw);

	cancel_work_sync(&xudc->usb_role_sw_work);

	}



	usb_del_gadget_udc(&xudc->gadget);