usb: phy: tegra: Get PHY mode using DT

Added a new PHY mode to support OTG.
Obtained Tegra USB PHY mode using DT property.

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 59d111bf44a9d961b45fc85b99d659a8a67230b4..d64199044b4a88594ec96fa0fefbb0d0173870af 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -736,7 +736,6 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 
        tegra->phy = tegra_usb_phy_open(&pdev->dev, instance, hcd->regs,
                                        pdata->phy_config,
-                                       TEGRA_USB_PHY_MODE_HOST,
                                        tegra_ehci_set_pts,
                                        tegra_ehci_set_phcd);
        if (IS_ERR(tegra->phy)) {

diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 8bcc12f6804a0392d3d136d6f3b535df12992933..0ff1f3e03b1e3ebb93384f3a1df83979a4b4cae6 100644 (file)
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -687,7 +687,7 @@ static int  tegra_usb_phy_suspend(struct usb_phy *x, int suspend)
 }
 
 struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
-       void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,
+       void __iomem *regs, void *config,
        void (*set_pts)(struct usb_phy *x, u8 pts_val),
        void (*set_phcd)(struct usb_phy *x, bool enable))
 
@@ -705,7 +705,6 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
        phy->instance = instance;
        phy->regs = regs;
        phy->config = config;
-       phy->mode = phy_mode;
        phy->dev = dev;
        phy->is_legacy_phy =
                of_property_read_bool(np, "nvidia,has-legacy-mode");
@@ -717,6 +716,16 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
        else
                phy->is_ulpi_phy = true;
 
+       err = of_property_match_string(np, "dr_mode", "otg");
+       if (err < 0) {
+               err = of_property_match_string(np, "dr_mode", "peripheral");
+               if (err < 0)
+                       phy->mode = TEGRA_USB_PHY_MODE_HOST;
+               else
+                       phy->mode = TEGRA_USB_PHY_MODE_DEVICE;
+       } else
+               phy->mode = TEGRA_USB_PHY_MODE_OTG;
+
        if (!phy->config) {
                if (phy->is_ulpi_phy) {
                        pr_err("%s: ulpi phy configuration missing", __func__);

diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index 1b7519a8c0bf5e509e90fa0b5827713b0aaf219a..ff2d95978b385561c65dd4e60f9b68cf425b8f8f 100644 (file)
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -42,6 +42,7 @@ enum tegra_usb_phy_port_speed {
 enum tegra_usb_phy_mode {
        TEGRA_USB_PHY_MODE_DEVICE,
        TEGRA_USB_PHY_MODE_HOST,
+       TEGRA_USB_PHY_MODE_OTG,
 };
 
 struct tegra_xtal_freq;
@@ -66,7 +67,7 @@ struct tegra_usb_phy {
 };
 
 struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
-       void __iomem *regs, void *config, enum tegra_usb_phy_mode phy_mode,
+       void __iomem *regs, void *config,
        void (*set_pts)(struct usb_phy *x, u8 pts_val),
        void (*set_phcd)(struct usb_phy *x, bool enable));