Commit e8f7d2f4 authored by Nagarjuna Kristam's avatar Nagarjuna Kristam Committed by Thierry Reding

phy: tegra: xusb: Add usb-phy support

For USB 2 ports that has usb-role-switch enabled, add usb-phy for
corresponding USB 2 phy. USB role changes from role switch are then
updated to corresponding host and device mode drivers via usb-phy notifier
block.
Signed-off-by: default avatarNagarjuna Kristam <nkristam@nvidia.com>
Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
[treding@nvidia.com: rebase onto Greg's usb-next branch]
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f67213ce
...@@ -544,6 +544,8 @@ static void tegra_xusb_port_unregister(struct tegra_xusb_port *port) ...@@ -544,6 +544,8 @@ static void tegra_xusb_port_unregister(struct tegra_xusb_port *port)
if (!IS_ERR_OR_NULL(port->usb_role_sw)) { if (!IS_ERR_OR_NULL(port->usb_role_sw)) {
of_platform_depopulate(&port->dev); of_platform_depopulate(&port->dev);
usb_role_switch_unregister(port->usb_role_sw); usb_role_switch_unregister(port->usb_role_sw);
cancel_work_sync(&port->usb_phy_work);
usb_remove_phy(&port->usb_phy);
} }
device_unregister(&port->dev); device_unregister(&port->dev);
...@@ -562,6 +564,35 @@ static const char * const usb_roles[] = { ...@@ -562,6 +564,35 @@ static const char * const usb_roles[] = {
[USB_ROLE_DEVICE] = "device", [USB_ROLE_DEVICE] = "device",
}; };
static enum usb_phy_events to_usb_phy_event(enum usb_role role)
{
switch (role) {
case USB_ROLE_DEVICE:
return USB_EVENT_VBUS;
case USB_ROLE_HOST:
return USB_EVENT_ID;
default:
return USB_EVENT_NONE;
}
}
static void tegra_xusb_usb_phy_work(struct work_struct *work)
{
struct tegra_xusb_port *port = container_of(work,
struct tegra_xusb_port,
usb_phy_work);
enum usb_role role = usb_role_switch_get_role(port->usb_role_sw);
usb_phy_set_event(&port->usb_phy, to_usb_phy_event(role));
dev_dbg(&port->dev, "%s(): calling notifier for role %s\n", __func__,
usb_roles[role]);
atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
}
static int tegra_xusb_role_sw_set(struct usb_role_switch *sw, static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
enum usb_role role) enum usb_role role)
{ {
...@@ -569,11 +600,40 @@ static int tegra_xusb_role_sw_set(struct usb_role_switch *sw, ...@@ -569,11 +600,40 @@ static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]); dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
schedule_work(&port->usb_phy_work);
return 0;
}
static int tegra_xusb_set_peripheral(struct usb_otg *otg,
struct usb_gadget *gadget)
{
struct tegra_xusb_port *port = container_of(otg->usb_phy,
struct tegra_xusb_port,
usb_phy);
if (gadget != NULL)
schedule_work(&port->usb_phy_work);
return 0; return 0;
} }
static int tegra_xusb_set_host(struct usb_otg *otg, struct usb_bus *host)
{
struct tegra_xusb_port *port = container_of(otg->usb_phy,
struct tegra_xusb_port,
usb_phy);
if (host != NULL)
schedule_work(&port->usb_phy_work);
return 0;
}
static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port) static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port)
{ {
struct tegra_xusb_lane *lane;
struct usb_role_switch_desc role_sx_desc = { struct usb_role_switch_desc role_sx_desc = {
.fwnode = dev_fwnode(&port->dev), .fwnode = dev_fwnode(&port->dev),
.set = tegra_xusb_role_sw_set, .set = tegra_xusb_role_sw_set,
...@@ -600,8 +660,32 @@ static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port) ...@@ -600,8 +660,32 @@ static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port)
return err; return err;
} }
INIT_WORK(&port->usb_phy_work, tegra_xusb_usb_phy_work);
usb_role_switch_set_drvdata(port->usb_role_sw, port); usb_role_switch_set_drvdata(port->usb_role_sw, port);
port->usb_phy.otg = devm_kzalloc(&port->dev, sizeof(struct usb_otg),
GFP_KERNEL);
if (!port->usb_phy.otg)
return -ENOMEM;
lane = tegra_xusb_find_lane(port->padctl, "usb2", port->index);
/*
* Assign phy dev to usb-phy dev. Host/device drivers can use phy
* reference to retrieve usb-phy details.
*/
port->usb_phy.dev = &lane->pad->lanes[port->index]->dev;
port->usb_phy.dev->driver = port->padctl->dev->driver;
port->usb_phy.otg->usb_phy = &port->usb_phy;
port->usb_phy.otg->set_peripheral = tegra_xusb_set_peripheral;
port->usb_phy.otg->set_host = tegra_xusb_set_host;
err = usb_add_phy_dev(&port->usb_phy);
if (err < 0) {
dev_err(&port->dev, "Failed to add USB PHY: %d\n", err);
return err;
}
/* populate connector entry */ /* populate connector entry */
of_platform_populate(port->dev.of_node, NULL, NULL, &port->dev); of_platform_populate(port->dev.of_node, NULL, NULL, &port->dev);
......
...@@ -268,6 +268,8 @@ struct tegra_xusb_port { ...@@ -268,6 +268,8 @@ struct tegra_xusb_port {
struct device dev; struct device dev;
struct usb_role_switch *usb_role_sw; struct usb_role_switch *usb_role_sw;
struct work_struct usb_phy_work;
struct usb_phy usb_phy;
const struct tegra_xusb_port_ops *ops; const struct tegra_xusb_port_ops *ops;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment