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 V2 10/18] usb: gadget: tegra-xudc: Add usb-phy support
Date: Wed, 18 Dec 2019 14:46:23 +0530 [thread overview]
Message-ID: <1576660591-10383-11-git-send-email-nkristam@nvidia.com> (raw)
In-Reply-To: <1576660591-10383-1-git-send-email-nkristam@nvidia.com>
usb-phy is used to get notified on the USB role changes. Get usb-phy from
the utmi phy.
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
---
V2:
- No changes in this version
---
drivers/usb/gadget/udc/tegra-xudc.c | 39 +++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
index 6ddb974..0f27d57 100644
--- a/drivers/usb/gadget/udc/tegra-xudc.c
+++ b/drivers/usb/gadget/udc/tegra-xudc.c
@@ -26,7 +26,9 @@
#include <linux/reset.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
+#include <linux/usb/otg.h>
#include <linux/usb/role.h>
+#include <linux/usb/phy.h>
#include <linux/workqueue.h>
/* XUSB_DEV registers */
@@ -488,6 +490,9 @@ struct tegra_xudc {
bool suspended;
bool powergated;
+ struct usb_phy *usbphy;
+ struct notifier_block vbus_nb;
+
struct completion disconnect_complete;
bool selfpowered;
@@ -678,7 +683,22 @@ static void tegra_xudc_usb_role_sw_work(struct work_struct *work)
tegra_xudc_device_mode_on(xudc);
else
tegra_xudc_device_mode_off(xudc);
+}
+
+static int tegra_xudc_vbus_notifier(struct notifier_block *nb,
+ unsigned long action, void *data)
+{
+ struct tegra_xudc *xudc = container_of(nb, struct tegra_xudc,
+ vbus_nb);
+
+ dev_dbg(xudc->dev, "%s action is %ld\n", __func__, action);
+
+ xudc->role = (enum usb_role)action;
+ if (!xudc->suspended)
+ schedule_work(&xudc->usb_role_sw_work);
+
+ return NOTIFY_OK;
}
static void tegra_xudc_plc_reset_work(struct work_struct *work)
@@ -1949,6 +1969,9 @@ static int tegra_xudc_gadget_start(struct usb_gadget *gadget,
xudc_writel(xudc, val, CTRL);
}
+ if (xudc->usbphy)
+ otg_set_peripheral(xudc->usbphy->otg, gadget);
+
xudc->driver = driver;
unlock:
dev_dbg(xudc->dev, "%s: ret value is %d", __func__, ret);
@@ -1969,6 +1992,9 @@ static int tegra_xudc_gadget_stop(struct usb_gadget *gadget)
spin_lock_irqsave(&xudc->lock, flags);
+ if (xudc->usbphy)
+ otg_set_peripheral(xudc->usbphy->otg, NULL);
+
val = xudc_readl(xudc, CTRL);
val &= ~(CTRL_IE | CTRL_ENABLE);
xudc_writel(xudc, val, CTRL);
@@ -3573,10 +3599,15 @@ static int tegra_xudc_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&xudc->port_reset_war_work,
tegra_xudc_port_reset_war_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);
+ xudc->vbus_nb.notifier_call = tegra_xudc_vbus_notifier;
+ xudc->usbphy = devm_usb_get_phy_by_node(xudc->dev,
+ xudc->utmi_phy->dev.of_node,
+ &xudc->vbus_nb);
+ if (IS_ERR(xudc->usbphy)) {
+ err = PTR_ERR(xudc->usbphy);
+ dev_err(xudc->dev, "failed to get usbphy phy: %d\n", err);
+ goto free_eps;
+ }
pm_runtime_enable(&pdev->dev);
--
2.7.4
next prev parent reply other threads:[~2019-12-18 9:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 9:16 [Patch V2 00/18] Tegra XUSB OTG support Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 01/18] dt-bindings: phy: tegra-xusb: Add usb-role-switch Nagarjuna Kristam
2019-12-19 13:05 ` Thierry Reding
2019-12-20 8:08 ` JC Kuo
2020-01-10 11:16 ` Thierry Reding
2020-01-13 4:37 ` Nagarjuna Kristam
2020-01-13 15:06 ` Thierry Reding
2019-12-18 9:16 ` [Patch V2 02/18] dt-bindings: usb: Add NVIDIA Tegra XUSB device mode controller binding Nagarjuna Kristam
2019-12-18 23:24 ` Rob Herring
2019-12-19 13:10 ` Thierry Reding
2019-12-18 9:16 ` [Patch V2 03/18] phy: tegra: xusb: Add usb-role-switch support Nagarjuna Kristam
2019-12-19 13:26 ` Thierry Reding
2019-12-27 6:39 ` Nagarjuna Kristam
2019-12-29 9:36 ` Thierry Reding
2019-12-30 5:17 ` Nagarjuna Kristam
2019-12-26 6:42 ` JC Kuo
2019-12-27 6:18 ` Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 04/18] phy: tegra: xusb: Add usb-phy support Nagarjuna Kristam
2019-12-19 13:37 ` Thierry Reding
2019-12-27 7:06 ` Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 05/18] phy: tegra: xusb: Add support to get companion USB 3 port Nagarjuna Kristam
2019-12-26 7:03 ` JC Kuo
2019-12-18 9:16 ` [Patch V2 06/18] phy: tegra: xusb: Add set_mode support for USB 2 phy on Tegra210 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 07/18] phy: tegra: xusb: Add set_mode support for utmi phy on Tegra186 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 08/18] usb: xhci-tegra: Add OTG support Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 09/18] usb: gadget: tegra-xudc: Remove usb-role-switch support Nagarjuna Kristam
2019-12-18 9:16 ` Nagarjuna Kristam [this message]
2019-12-18 9:16 ` [Patch V2 11/18] usb: gadget: tegra-xudc: use phy_set_mode to set/unset device mode Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 12/18] usb: gadget: tegra-xudc: support multiple device modes Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 13/18] arm64: tegra: update OTG port entries for jetson-tx1 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 14/18] arm64: tegra: update OTG port entries for jetson-tx2 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 15/18] arm64: tegra: Add xudc node for Tegra210 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 16/18] arm64: tegra: Enable xudc on Jetson TX1 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 17/18] arm64: tegra: Add xudc node for Tegra186 Nagarjuna Kristam
2019-12-18 9:16 ` [Patch V2 18/18] arm64: tegra: Enable xudc node on Jetson TX2 Nagarjuna Kristam
2019-12-19 13:13 ` [Patch V2 00/18] Tegra XUSB OTG support Thierry Reding
2019-12-20 7:35 ` JC Kuo
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=1576660591-10383-11-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).