usb: phy: msm: Add support for secondary PHY control

Allow support to use 2nd HSPHY with USB2 Core.
Some platforms may have configuration to allow USB controller
work with any of the two HSPHYs present. By default driver
configures USB core to use primary HSPHY. Add support to allow
user select 2nd HSPHY using DT parameter.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Cc: Manu Gautam <mgautam@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 22 insertions, 2 deletions

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index a6abb1b3a7f0..8d57045ac938 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -314,6 +314,9 @@ static int msm_otg_phy_reset(struct msm_otg *motg)
         if (!retries)
                 return -ETIMEDOUT;
 
+        if (motg->phy_number)
+                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
+
         dev_info(motg->phy.dev, "phy_reset: success\n");
         return 0;
 }
@@ -368,6 +371,9 @@ static int msm_otg_reset(struct usb_phy *phy)
                 ulpi_write(phy, ulpi_val, ULPI_USB_INT_EN_FALL);
         }
 
+        if (motg->phy_number)
+                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
+
         return 0;
 }
 
@@ -404,6 +410,7 @@ static int msm_otg_suspend(struct msm_otg *motg)
         struct usb_phy *phy = &motg->phy;
         struct usb_bus *bus = phy->otg->host;
         struct msm_otg_platform_data *pdata = motg->pdata;
+        void __iomem *addr;
         int cnt = 0;
 
         if (atomic_read(&motg->in_lpm))
@@ -463,9 +470,13 @@ static int msm_otg_suspend(struct msm_otg *motg)
          */
         writel(readl(USB_USBCMD) | ASYNC_INTR_CTRL | ULPI_STP_CTRL, USB_USBCMD);
 
+        addr = USB_PHY_CTRL;
+        if (motg->phy_number)
+                addr = USB_PHY_CTRL2;
+
         if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
                         motg->pdata->otg_control == OTG_PMIC_CONTROL)
-                writel(readl(USB_PHY_CTRL) | PHY_RETEN, USB_PHY_CTRL);
+                writel(readl(addr) | PHY_RETEN, addr);
 
         clk_disable_unprepare(motg->pclk);
         clk_disable_unprepare(motg->clk);
@@ -495,6 +506,7 @@ static int msm_otg_resume(struct msm_otg *motg)
 {
         struct usb_phy *phy = &motg->phy;
         struct usb_bus *bus = phy->otg->host;
+        void __iomem *addr;
         int cnt = 0;
         unsigned temp;
 
@@ -508,9 +520,14 @@ static int msm_otg_resume(struct msm_otg *motg)
 
         if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
                         motg->pdata->otg_control == OTG_PMIC_CONTROL) {
+
+                addr = USB_PHY_CTRL;
+                if (motg->phy_number)
+                        addr = USB_PHY_CTRL2;
+
                 msm_hsusb_ldo_set_mode(motg, 1);
                 msm_hsusb_config_vddcx(motg, 1);
-                writel(readl(USB_PHY_CTRL) & ~PHY_RETEN, USB_PHY_CTRL);
+                writel(readl(addr) & ~PHY_RETEN, addr);
         }
 
         temp = readl(USB_USBCMD);
@@ -1399,6 +1416,9 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
                 if (val == OTG_PMIC_CONTROL)
                         pdata->otg_control = val;
 
+        if (!of_property_read_u32(node, "qcom,phy-num", &val) && val < 2)
+                motg->phy_number = val;
+
         prop = of_find_property(node, "qcom,phy-init-sequence", &len);
         if (!prop || !len)
                 return 0;