From: Nagarjuna Kristam <nkristam@nvidia.com>
To: <balbi@kernel.org>, <gregkh@linuxfoundation.org>,
<thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
<mark.rutland@arm.com>, <robh+dt@kernel.org>, <kishon@ti.com>
Cc: <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Nagarjuna Kristam <nkristam@nvidia.com>
Subject: [PATCH 09/18] usb: gadget: tegra-xudc: Remove usb-role-switch support
Date: Fri, 6 Dec 2019 16:20:12 +0530 [thread overview]
Message-ID: <1575629421-7039-10-git-send-email-nkristam@nvidia.com> (raw)
In-Reply-To: <1575629421-7039-1-git-send-email-nkristam@nvidia.com>
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: Nagarjuna Kristam <nkristam@nvidia.com>
---
drivers/usb/gadget/udc/tegra-xudc.c | 65 ++++++++++---------------------------
1 file changed, 17 insertions(+), 48 deletions(-)
diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
index 634c2c1..6ddb974 100644
--- a/drivers/usb/gadget/udc/tegra-xudc.c
+++ b/drivers/usb/gadget/udc/tegra-xudc.c
@@ -477,8 +477,8 @@ struct tegra_xudc {
struct clk_bulk_data *clks;
- enum usb_role device_mode;
- struct usb_role_switch *usb_role_sw;
+ enum usb_role role;
+ bool device_mode;
struct work_struct usb_role_sw_work;
struct phy *usb3_phy;
@@ -596,6 +596,8 @@ static void tegra_xudc_device_mode_on(struct tegra_xudc *xudc)
{
int err;
+ if (xudc->device_mode)
+ return;
pm_runtime_get_sync(xudc->dev);
err = phy_power_on(xudc->utmi_phy);
@@ -610,7 +612,8 @@ static void tegra_xudc_device_mode_on(struct tegra_xudc *xudc)
tegra_xusb_padctl_set_vbus_override(xudc->padctl, true);
- xudc->device_mode = USB_ROLE_DEVICE;
+ xudc->device_mode = true;
+
}
static void tegra_xudc_device_mode_off(struct tegra_xudc *xudc)
@@ -619,6 +622,9 @@ static void tegra_xudc_device_mode_off(struct tegra_xudc *xudc)
u32 pls, val;
int err;
+ if (!xudc->device_mode)
+ return;
+
dev_dbg(xudc->dev, "device mode off\n");
connected = !!(xudc_readl(xudc, PORTSC) & PORTSC_CCS);
@@ -643,7 +649,7 @@ static void tegra_xudc_device_mode_off(struct tegra_xudc *xudc)
xudc_writel(xudc, val, PORTSC);
}
- xudc->device_mode = USB_ROLE_NONE;
+ xudc->device_mode = false;
/* Wait for disconnect event. */
if (connected)
@@ -668,31 +674,13 @@ 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->role == USB_ROLE_DEVICE)
tegra_xudc_device_mode_on(xudc);
else
tegra_xudc_device_mode_off(xudc);
}
-static int tegra_xudc_usb_role_sw_set(struct device *dev, enum usb_role role)
-{
- struct tegra_xudc *xudc = dev_get_drvdata(dev);
- unsigned long flags;
-
- dev_dbg(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)
{
struct delayed_work *dwork = to_delayed_work(work);
@@ -729,8 +717,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);
@@ -3457,7 +3444,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;
@@ -3587,23 +3573,10 @@ 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);
-
- 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");
- schedule_work(&xudc->usb_role_sw_work);
- }
+ /* Set the mode as device mode and this keeps phy always ON */
+ dev_info(xudc->dev, "Set usb role to device mode always");
+ xudc->role = USB_ROLE_DEVICE;
+ schedule_work(&xudc->usb_role_sw_work);
pm_runtime_enable(&pdev->dev);
@@ -3643,11 +3616,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);
- }
+ cancel_work_sync(&xudc->usb_role_sw_work);
usb_del_gadget_udc(&xudc->gadget);
--
2.7.4
next prev parent reply other threads:[~2019-12-06 10:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-06 10:50 [PATCH 00/18] Tegra XUSB OTG support Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 01/18] dt-bindings: phy: tegra-xusb: Add usb-role-switch Nagarjuna Kristam
2019-12-06 14:49 ` Thierry Reding
2019-12-09 4:45 ` Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 02/18] dt-bindings: usb: Add NVIDIA Tegra XUSB device mode controller binding Nagarjuna Kristam
2019-12-13 18:45 ` Rob Herring
2019-12-16 6:30 ` Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 03/18] phy: tegra: xusb: Add usb-role-switch support Nagarjuna Kristam
2019-12-06 14:54 ` Thierry Reding
2019-12-10 3:52 ` Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 04/18] phy: tegra: xusb: Add usb-phy support Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 05/18] phy: tegra: xusb: Add support to get companion USB 3 port Nagarjuna Kristam
2019-12-06 14:57 ` Thierry Reding
2019-12-09 6:27 ` Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 06/18] phy: tegra: xusb: Add set_mode support for USB 2 phy on Tegra210 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 07/18] phy: tegra: xusb: Add set_mode support for utmi phy on Tegra186 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 08/18] usb: xhci-tegra: Add OTG support Nagarjuna Kristam
2019-12-06 10:50 ` Nagarjuna Kristam [this message]
2019-12-06 10:50 ` [PATCH 10/18] usb: gadget: tegra-xudc: Add usb-phy support Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 11/18] usb: gadget: tegra-xudc: use phy_set_mode to set/unset device mode Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 12/18] usb: gadget: tegra-xudc: support multiple device modes Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 13/18] arm64: tegra: update OTG port entries for jetson-tx1 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 14/18] arm64: tegra: update OTG port entries for jetson-tx2 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 15/18] arm64: tegra: Add xudc node for Tegra210 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 16/18] arm64: tegra: Enable xudc on Jetson TX1 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 17/18] arm64: tegra: Add xudc node for Tegra186 Nagarjuna Kristam
2019-12-06 10:50 ` [PATCH 18/18] arm64: tegra: Enable xudc node on Jetson TX2 Nagarjuna Kristam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575629421-7039-10-git-send-email-nkristam@nvidia.com \
--to=nkristam@nvidia.com \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).