1 files changed, 45 insertions, 87 deletions

diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c
index 9d13c81754e0..5487d38481af 100644
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/tegra_usb_phy.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -35,19 +36,6 @@
 
 #define ULPI_VIEWPORT           0x170
 
-#define USB_PORTSC1             0x184
-#define   USB_PORTSC1_PTS(x)    (((x) & 0x3) << 30)
-#define   USB_PORTSC1_PSPD(x)   (((x) & 0x3) << 26)
-#define   USB_PORTSC1_PHCD      (1 << 23)
-#define   USB_PORTSC1_WKOC      (1 << 22)
-#define   USB_PORTSC1_WKDS      (1 << 21)
-#define   USB_PORTSC1_WKCN      (1 << 20)
-#define   USB_PORTSC1_PTC(x)    (((x) & 0xf) << 16)
-#define   USB_PORTSC1_PP        (1 << 12)
-#define   USB_PORTSC1_SUSP      (1 << 7)
-#define   USB_PORTSC1_PE        (1 << 2)
-#define   USB_PORTSC1_CCS       (1 << 0)
-
 #define USB_SUSP_CTRL           0x400
 #define   USB_WAKE_ON_CNNT_EN_DEV       (1 << 3)
 #define   USB_WAKE_ON_DISCON_EN_DEV     (1 << 4)
@@ -208,11 +196,6 @@ static struct tegra_utmip_config utmip_default[] = {
         },
 };
 
-static inline bool phy_is_ulpi(struct tegra_usb_phy *phy)
-{
-        return (phy->instance == 1);
-}
-
 static int utmip_pad_open(struct tegra_usb_phy *phy)
 {
         phy->pad_clk = clk_get_sys("utmip-pad", NULL);
@@ -221,7 +204,7 @@ static int utmip_pad_open(struct tegra_usb_phy *phy)
                 return PTR_ERR(phy->pad_clk);
         }
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 phy->pad_regs = phy->regs;
         } else {
                 phy->pad_regs = ioremap(TEGRA_USB_BASE, TEGRA_USB_SIZE);
@@ -236,7 +219,7 @@ static int utmip_pad_open(struct tegra_usb_phy *phy)
 
 static void utmip_pad_close(struct tegra_usb_phy *phy)
 {
-        if (phy->instance != 0)
+        if (!phy->is_legacy_phy)
                 iounmap(phy->pad_regs);
         clk_put(phy->pad_clk);
 }
@@ -305,7 +288,7 @@ static void utmi_phy_clk_disable(struct tegra_usb_phy *phy)
         unsigned long val;
         void __iomem *base = phy->regs;
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 val = readl(base + USB_SUSP_CTRL);
                 val |= USB_SUSP_SET;
                 writel(val, base + USB_SUSP_CTRL);
@@ -315,13 +298,8 @@ static void utmi_phy_clk_disable(struct tegra_usb_phy *phy)
                 val = readl(base + USB_SUSP_CTRL);
                 val &= ~USB_SUSP_SET;
                 writel(val, base + USB_SUSP_CTRL);
-        }
-
-        if (phy->instance == 2) {
-                val = readl(base + USB_PORTSC1);
-                val |= USB_PORTSC1_PHCD;
-                writel(val, base + USB_PORTSC1);
-        }
+        } else
+                tegra_ehci_set_phcd(&phy->u_phy, true);
 
         if (utmi_wait_register(base + USB_SUSP_CTRL, USB_PHY_CLK_VALID, 0) < 0)
                 pr_err("%s: timeout waiting for phy to stabilize\n", __func__);
@@ -332,7 +310,7 @@ static void utmi_phy_clk_enable(struct tegra_usb_phy *phy)
         unsigned long val;
         void __iomem *base = phy->regs;
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 val = readl(base + USB_SUSP_CTRL);
                 val |= USB_SUSP_CLR;
                 writel(val, base + USB_SUSP_CTRL);
@@ -342,13 +320,8 @@ static void utmi_phy_clk_enable(struct tegra_usb_phy *phy)
                 val = readl(base + USB_SUSP_CTRL);
                 val &= ~USB_SUSP_CLR;
                 writel(val, base + USB_SUSP_CTRL);
-        }
-
-        if (phy->instance == 2) {
-                val = readl(base + USB_PORTSC1);
-                val &= ~USB_PORTSC1_PHCD;
-                writel(val, base + USB_PORTSC1);
-        }
+        } else
+                tegra_ehci_set_phcd(&phy->u_phy, false);
 
         if (utmi_wait_register(base + USB_SUSP_CTRL, USB_PHY_CLK_VALID,
                                                      USB_PHY_CLK_VALID))
@@ -365,7 +338,7 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
         val |= UTMIP_RESET;
         writel(val, base + USB_SUSP_CTRL);
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 val = readl(base + USB1_LEGACY_CTRL);
                 val |= USB1_NO_LEGACY_MODE;
                 writel(val, base + USB1_LEGACY_CTRL);
@@ -440,16 +413,14 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
         val |= UTMIP_BIAS_PDTRK_COUNT(0x5);
         writel(val, base + UTMIP_BIAS_CFG1);
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 val = readl(base + UTMIP_SPARE_CFG0);
                 if (phy->mode == TEGRA_USB_PHY_MODE_DEVICE)
                         val &= ~FUSE_SETUP_SEL;
                 else
                         val |= FUSE_SETUP_SEL;
                 writel(val, base + UTMIP_SPARE_CFG0);
-        }
-
-        if (phy->instance == 2) {
+        } else {
                 val = readl(base + USB_SUSP_CTRL);
                 val |= UTMIP_PHY_ENABLE;
                 writel(val, base + USB_SUSP_CTRL);
@@ -459,7 +430,7 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
         val &= ~UTMIP_RESET;
         writel(val, base + USB_SUSP_CTRL);
 
-        if (phy->instance == 0) {
+        if (phy->is_legacy_phy) {
                 val = readl(base + USB1_LEGACY_CTRL);
                 val &= ~USB1_VBUS_SENSE_CTL_MASK;
                 val |= USB1_VBUS_SENSE_CTL_A_SESS_VLD;
@@ -472,11 +443,8 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)
 
         utmi_phy_clk_enable(phy);
 
-        if (phy->instance == 2) {
-                val = readl(base + USB_PORTSC1);
-                val &= ~USB_PORTSC1_PTS(~0);
-                writel(val, base + USB_PORTSC1);
-        }
+        if (!phy->is_legacy_phy)
+                tegra_ehci_set_pts(&phy->u_phy, 0);
 
         return 0;
 }
@@ -621,10 +589,6 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
                 return ret;
         }
 
-        val = readl(base + USB_PORTSC1);
-        val |= USB_PORTSC1_WKOC | USB_PORTSC1_WKDS | USB_PORTSC1_WKCN;
-        writel(val, base + USB_PORTSC1);
-
         val = readl(base + USB_SUSP_CTRL);
         val |= USB_SUSP_CLR;
         writel(val, base + USB_SUSP_CTRL);
@@ -639,17 +603,8 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
 
 static int ulpi_phy_power_off(struct tegra_usb_phy *phy)
 {
-        unsigned long val;
-        void __iomem *base = phy->regs;
         struct tegra_ulpi_config *config = phy->config;
 
-        /* Clear WKCN/WKDS/WKOC wake-on events that can cause the USB
-         * Controller to immediately bring the ULPI PHY out of low power
-         */
-        val = readl(base + USB_PORTSC1);
-        val &= ~(USB_PORTSC1_WKOC | USB_PORTSC1_WKDS | USB_PORTSC1_WKCN);
-        writel(val, base + USB_PORTSC1);
-
         clk_disable(phy->clk);
         return gpio_direction_output(config->reset_gpio, 0);
 }
@@ -660,7 +615,7 @@ static int	tegra_phy_init(struct usb_phy *x)
         struct tegra_ulpi_config *ulpi_config;
         int err;
 
-        if (phy_is_ulpi(phy)) {
+        if (phy->is_ulpi_phy) {
                 ulpi_config = phy->config;
                 phy->clk = clk_get_sys(NULL, ulpi_config->clk);
                 if (IS_ERR(phy->clk)) {
@@ -698,7 +653,7 @@ static void tegra_usb_phy_close(struct usb_phy *x)
 {
         struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
 
-        if (phy_is_ulpi(phy))
+        if (phy->is_ulpi_phy)
                 clk_put(phy->clk);
         else
                 utmip_pad_close(phy);
@@ -709,7 +664,7 @@ static void tegra_usb_phy_close(struct usb_phy *x)
 
 static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
 {
-        if (phy_is_ulpi(phy))
+        if (phy->is_ulpi_phy)
                 return ulpi_phy_power_on(phy);
         else
                 return utmi_phy_power_on(phy);
@@ -717,7 +672,7 @@ static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
 
 static int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)
 {
-        if (phy_is_ulpi(phy))
+        if (phy->is_ulpi_phy)
                 return ulpi_phy_power_off(phy);
         else
                 return utmi_phy_power_off(phy);
@@ -739,8 +694,9 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
         unsigned long parent_rate;
         int i;
         int err;
+        struct device_node *np = dev->of_node;
 
-        phy = kmalloc(sizeof(struct tegra_usb_phy), GFP_KERNEL);
+        phy = kzalloc(sizeof(struct tegra_usb_phy), GFP_KERNEL);
         if (!phy)
                 return ERR_PTR(-ENOMEM);
 
@@ -749,9 +705,16 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
         phy->config = config;
         phy->mode = phy_mode;
         phy->dev = dev;
+        phy->is_legacy_phy =
+                of_property_read_bool(np, "nvidia,has-legacy-mode");
+        err = of_property_match_string(np, "phy_type", "ulpi");
+        if (err < 0)
+                phy->is_ulpi_phy = false;
+        else
+                phy->is_ulpi_phy = true;
 
         if (!phy->config) {
-                if (phy_is_ulpi(phy)) {
+                if (phy->is_ulpi_phy) {
                         pr_err("%s: ulpi phy configuration missing", __func__);
                         err = -EINVAL;
                         goto err0;
@@ -796,45 +759,40 @@ err0:
 }
 EXPORT_SYMBOL_GPL(tegra_usb_phy_open);
 
-void tegra_usb_phy_preresume(struct tegra_usb_phy *phy)
+void tegra_usb_phy_preresume(struct usb_phy *x)
 {
-        if (!phy_is_ulpi(phy))
+        struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
+
+        if (!phy->is_ulpi_phy)
                 utmi_phy_preresume(phy);
 }
 EXPORT_SYMBOL_GPL(tegra_usb_phy_preresume);
 
-void tegra_usb_phy_postresume(struct tegra_usb_phy *phy)
+void tegra_usb_phy_postresume(struct usb_phy *x)
 {
-        if (!phy_is_ulpi(phy))
+        struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
+
+        if (!phy->is_ulpi_phy)
                 utmi_phy_postresume(phy);
 }
 EXPORT_SYMBOL_GPL(tegra_usb_phy_postresume);
 
-void tegra_ehci_phy_restore_start(struct tegra_usb_phy *phy,
+void tegra_ehci_phy_restore_start(struct usb_phy *x,
                                  enum tegra_usb_phy_port_speed port_speed)
 {
-        if (!phy_is_ulpi(phy))
+        struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
+
+        if (!phy->is_ulpi_phy)
                 utmi_phy_restore_start(phy, port_speed);
 }
 EXPORT_SYMBOL_GPL(tegra_ehci_phy_restore_start);
 
-void tegra_ehci_phy_restore_end(struct tegra_usb_phy *phy)
+void tegra_ehci_phy_restore_end(struct usb_phy *x)
 {
-        if (!phy_is_ulpi(phy))
+        struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
+
+        if (!phy->is_ulpi_phy)
                 utmi_phy_restore_end(phy);
 }
 EXPORT_SYMBOL_GPL(tegra_ehci_phy_restore_end);
 
-void tegra_usb_phy_clk_disable(struct tegra_usb_phy *phy)
-{
-        if (!phy_is_ulpi(phy))
-                utmi_phy_clk_disable(phy);
-}
-EXPORT_SYMBOL_GPL(tegra_usb_phy_clk_disable);
-
-void tegra_usb_phy_clk_enable(struct tegra_usb_phy *phy)
-{
-        if (!phy_is_ulpi(phy))
-                utmi_phy_clk_enable(phy);
-}
-EXPORT_SYMBOL_GPL(tegra_usb_phy_clk_enable);