Merge branch 'qcom/drivers' into next/drivers

* qcom/drivers:
  tty: serial: Limit msm_serial_hs driver to platforms that use it
  mmc: msm_sdcc: Limit driver to platforms that use it
  usb: phy: msm: Move mach dependent code to platform data

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 15 insertions, 20 deletions

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index e9d4cd960ecd..9a47d4403e86 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -40,8 +40,6 @@
 #include <linux/usb/msm_hsusb_hw.h>
 #include <linux/regulator/consumer.h>
 
-#include <mach/clk.h>
-
 #define MSM_USB_BASE    (motg->regs)
 #define DRIVER_NAME     "msm_otg"
 
@@ -308,33 +306,30 @@ static void ulpi_init(struct msm_otg *motg)
 
 static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
 {
-        int ret;
+        int ret = 0;
+
+        if (!motg->pdata->link_clk_reset)
+                return ret;
+
+        ret = motg->pdata->link_clk_reset(motg->clk, assert);
+        if (ret)
+                dev_err(motg->phy.dev, "usb link clk reset %s failed\n",
+                        assert ? "assert" : "deassert");
 
-        if (assert) {
-                ret = clk_reset(motg->clk, CLK_RESET_ASSERT);
-                if (ret)
-                        dev_err(motg->phy.dev, "usb hs_clk assert failed\n");
-        } else {
-                ret = clk_reset(motg->clk, CLK_RESET_DEASSERT);
-                if (ret)
-                        dev_err(motg->phy.dev, "usb hs_clk deassert failed\n");
-        }
         return ret;
 }
 
 static int msm_otg_phy_clk_reset(struct msm_otg *motg)
 {
-        int ret;
+        int ret = 0;
 
-        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_ASSERT);
-        if (ret) {
-                dev_err(motg->phy.dev, "usb phy clk assert failed\n");
+        if (!motg->pdata->phy_clk_reset)
                 return ret;
-        }
-        usleep_range(10000, 12000);
-        ret = clk_reset(motg->phy_reset_clk, CLK_RESET_DEASSERT);
+
+        ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
         if (ret)
-                dev_err(motg->phy.dev, "usb phy clk deassert failed\n");
+                dev_err(motg->phy.dev, "usb phy clk reset failed\n");
+
         return ret;
 }