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 V3 03/18] phy: tegra: xusb: Add usb-role-switch support
Date: Mon, 30 Dec 2019 16:39:40 +0530 [thread overview]
Message-ID: <1577704195-2535-4-git-send-email-nkristam@nvidia.com> (raw)
In-Reply-To: <1577704195-2535-1-git-send-email-nkristam@nvidia.com>
If usb-role-switch property is present in USB 2 port, register
usb-role-switch to receive usb role changes.
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
---
V3:
- Driver aborts if usb-role-switch is not added in dt forotg/peripheral
roles.
- Added role name strings instead of enum values in debug prints.
- Updated arguments and variable allignments as per Thierry inputs.
---
V2:
- Removed dev_set_drvdata for port->dev.
- Added of_platform_depopulate during error handling and driver removal.
---
drivers/phy/tegra/Kconfig | 1 +
drivers/phy/tegra/xusb.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
drivers/phy/tegra/xusb.h | 3 +++
3 files changed, 61 insertions(+)
diff --git a/drivers/phy/tegra/Kconfig b/drivers/phy/tegra/Kconfig
index f9817c3..df07c4d 100644
--- a/drivers/phy/tegra/Kconfig
+++ b/drivers/phy/tegra/Kconfig
@@ -2,6 +2,7 @@
config PHY_TEGRA_XUSB
tristate "NVIDIA Tegra XUSB pad controller driver"
depends on ARCH_TEGRA
+ select USB_CONN_GPIO
help
Choose this option if you have an NVIDIA Tegra SoC.
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index f98ec39..11ea9b5 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -523,6 +523,7 @@ static int tegra_xusb_port_init(struct tegra_xusb_port *port,
port->dev.type = &tegra_xusb_port_type;
port->dev.of_node = of_node_get(np);
port->dev.parent = padctl->dev;
+ port->dev.driver = padctl->dev->driver;
err = dev_set_name(&port->dev, "%s-%u", name, index);
if (err < 0)
@@ -541,6 +542,11 @@ static int tegra_xusb_port_init(struct tegra_xusb_port *port,
static void tegra_xusb_port_unregister(struct tegra_xusb_port *port)
{
+ if (!IS_ERR_OR_NULL(port->usb_role_sw)) {
+ of_platform_depopulate(&port->dev);
+ usb_role_switch_unregister(port->usb_role_sw);
+ }
+
device_unregister(&port->dev);
}
@@ -551,11 +557,48 @@ static const char *const modes[] = {
[USB_DR_MODE_OTG] = "otg",
};
+static const char * const usb_roles[] = {
+ [USB_ROLE_NONE] = "none",
+ [USB_ROLE_HOST] = "host",
+ [USB_ROLE_DEVICE] = "device",
+};
+
+static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
+{
+ dev_dbg(dev, "%s: role %s\n", __func__, usb_roles[role]);
+
+ return 0;
+}
+
+static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port)
+{
+ struct usb_role_switch_desc role_sx_desc = {
+ .fwnode = dev_fwnode(&port->dev),
+ .set = tegra_xusb_role_sw_set,
+ };
+ int err = 0;
+
+ port->usb_role_sw = usb_role_switch_register(&port->dev,
+ &role_sx_desc);
+ if (IS_ERR(port->usb_role_sw)) {
+ err = PTR_ERR(port->usb_role_sw);
+ dev_err(&port->dev, "failed to register USB role switch: %d",
+ err);
+ return err;
+ }
+
+ /* populate connector entry */
+ of_platform_populate(port->dev.of_node, NULL, NULL, &port->dev);
+
+ return err;
+}
+
static int tegra_xusb_usb2_port_parse_dt(struct tegra_xusb_usb2_port *usb2)
{
struct tegra_xusb_port *port = &usb2->base;
struct device_node *np = port->dev.of_node;
const char *mode;
+ int err;
usb2->internal = of_property_read_bool(np, "nvidia,internal");
@@ -572,6 +615,20 @@ static int tegra_xusb_usb2_port_parse_dt(struct tegra_xusb_usb2_port *usb2)
usb2->mode = USB_DR_MODE_HOST;
}
+ /* usb-role-switch property is mandatory for OTG/Peripheral modes */
+ if (usb2->mode == USB_DR_MODE_PERIPHERAL ||
+ usb2->mode == USB_DR_MODE_OTG) {
+ if (of_property_read_bool(np, "usb-role-switch")) {
+ err = tegra_xusb_setup_usb_role_switch(port);
+ if (err < 0)
+ return err;
+ } else {
+ dev_err(&port->dev, "usb-role-switch not found for %s mode",
+ modes[usb2->mode]);
+ return -EINVAL;
+ }
+ }
+
usb2->supply = devm_regulator_get(&port->dev, "vbus");
return PTR_ERR_OR_ZERO(usb2->supply);
}
diff --git a/drivers/phy/tegra/xusb.h b/drivers/phy/tegra/xusb.h
index da94fcc..9f27899 100644
--- a/drivers/phy/tegra/xusb.h
+++ b/drivers/phy/tegra/xusb.h
@@ -12,6 +12,7 @@
#include <linux/workqueue.h>
#include <linux/usb/otg.h>
+#include <linux/usb/role.h>
/* legacy entry points for backwards-compatibility */
int tegra_xusb_padctl_legacy_probe(struct platform_device *pdev);
@@ -266,6 +267,8 @@ struct tegra_xusb_port {
struct list_head list;
struct device dev;
+ struct usb_role_switch *usb_role_sw;
+
const struct tegra_xusb_port_ops *ops;
};
--
2.7.4
next prev parent reply other threads:[~2019-12-30 11:13 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 11:09 [Patch V3 00/18] Tegra XUSB OTG support Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 01/18] dt-bindings: phy: tegra-xusb: Add usb-role-switch Nagarjuna Kristam
2020-01-04 0:37 ` Rob Herring
2019-12-30 11:09 ` [Patch V3 02/18] dt-bindings: usb: Add NVIDIA Tegra XUSB device mode controller binding Nagarjuna Kristam
2019-12-30 11:09 ` Nagarjuna Kristam [this message]
2020-01-28 17:32 ` [Patch V3 03/18] phy: tegra: xusb: Add usb-role-switch support Thierry Reding
2020-01-29 9:15 ` Nagarjuna Kristam
2020-01-29 9:26 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 04/18] phy: tegra: xusb: Add usb-phy support Nagarjuna Kristam
2020-01-28 17:38 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 05/18] phy: tegra: xusb: Add support to get companion USB 3 port Nagarjuna Kristam
2020-01-28 17:40 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 06/18] phy: tegra: xusb: Add set_mode support for USB 2 phy on Tegra210 Nagarjuna Kristam
2020-01-28 17:41 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 07/18] phy: tegra: xusb: Add set_mode support for utmi phy on Tegra186 Nagarjuna Kristam
2020-01-28 17:45 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 08/18] usb: xhci-tegra: Add OTG support Nagarjuna Kristam
2020-01-28 17:54 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 09/18] usb: gadget: tegra-xudc: Remove usb-role-switch support Nagarjuna Kristam
2020-01-28 17:58 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 10/18] usb: gadget: tegra-xudc: Add usb-phy support Nagarjuna Kristam
2020-01-28 18:02 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 11/18] usb: gadget: tegra-xudc: use phy_set_mode to set/unset device mode Nagarjuna Kristam
2020-01-28 18:03 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 12/18] usb: gadget: tegra-xudc: support multiple device modes Nagarjuna Kristam
2020-01-28 18:10 ` Thierry Reding
2020-01-29 6:50 ` Nagarjuna Kristam
2020-01-29 9:27 ` Thierry Reding
2019-12-30 11:09 ` [Patch V3 13/18] arm64: tegra: update OTG port entries for jetson-tx1 Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 14/18] arm64: tegra: update OTG port entries for jetson-tx2 Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 15/18] arm64: tegra: Add xudc node for Tegra210 Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 16/18] arm64: tegra: Enable xudc on Jetson TX1 Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 17/18] arm64: tegra: Add xudc node for Tegra186 Nagarjuna Kristam
2019-12-30 11:09 ` [Patch V3 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=1577704195-2535-4-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).