usb: phy: msm: Move mach dependent code to platform data

This patch fix compilation error when driver is compiled
in multi-platform builds.

drivers/built-in.o: In function `msm_otg_link_clk_reset':
./drivers/usb/phy/phy-msm-usb.c:314: undefined reference to `clk_reset'
./drivers/usb/phy/phy-msm-usb.c:318: undefined reference to `clk_reset'

Use platform data supplied reset handlers and adjust error
messages reported when reset sequence fail.

This is an intermediate step before adding support for reset
framework and newer targets.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 70 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index f9af5a46e8b6..46de789ad3ae 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -30,6 +30,7 @@
 #include <asm/memory.h>
 #include <asm/setup.h>
 
+#include <mach/clk.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
 
@@ -60,10 +61,44 @@ static int hsusb_phy_init_seq[] = {
         -1
 };
 
+static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
+{
+        int ret;
+
+        if (assert) {
+                ret = clk_reset(link_clk, CLK_RESET_ASSERT);
+                if (ret)
+                        pr_err("usb hs_clk assert failed\n");
+        } else {
+                ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
+                if (ret)
+                        pr_err("usb hs_clk deassert failed\n");
+        }
+        return ret;
+}
+
+static int hsusb_phy_clk_reset(struct clk *phy_clk)
+{
+        int ret;
+
+        ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
+        if (ret) {
+                pr_err("usb phy clk assert failed\n");
+                return ret;
+        }
+        usleep_range(10000, 12000);
+        ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
+        if (ret)
+                pr_err("usb phy clk deassert failed\n");
+        return ret;
+}
+
 static struct msm_otg_platform_data msm_otg_pdata = {
         .phy_init_seq           = hsusb_phy_init_seq,
         .mode                   = USB_PERIPHERAL,
         .otg_control            = OTG_PHY_CONTROL,
+        .link_clk_reset         = hsusb_link_clk_reset,
+        .phy_clk_reset          = hsusb_phy_clk_reset,
 };
 
 struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 5f933bc50783..9169ec324a43 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -31,6 +31,7 @@
 #include <mach/irqs.h>
 #include <mach/sirc.h>
 #include <mach/vreg.h>
+#include <mach/clk.h>
 #include <linux/platform_data/mmc-msm_sdcc.h>
 
 #include "devices.h"
@@ -81,10 +82,44 @@ static int hsusb_phy_init_seq[] = {
         -1
 };
 
+static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
+{
+        int ret;
+
+        if (assert) {
+                ret = clk_reset(link_clk, CLK_RESET_ASSERT);
+                if (ret)
+                        pr_err("usb hs_clk assert failed\n");
+        } else {
+                ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
+                if (ret)
+                        pr_err("usb hs_clk deassert failed\n");
+        }
+        return ret;
+}
+
+static int hsusb_phy_clk_reset(struct clk *phy_clk)
+{
+        int ret;
+
+        ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
+        if (ret) {
+                pr_err("usb phy clk assert failed\n");
+                return ret;
+        }
+        usleep_range(10000, 12000);
+        ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
+        if (ret)
+                pr_err("usb phy clk deassert failed\n");
+        return ret;
+}
+
 static struct msm_otg_platform_data msm_otg_pdata = {
         .phy_init_seq           = hsusb_phy_init_seq,
         .mode                   = USB_PERIPHERAL,
         .otg_control            = OTG_PHY_CONTROL,
+        .link_clk_reset         = hsusb_link_clk_reset,
+        .phy_clk_reset          = hsusb_phy_clk_reset,
 };
 
 static struct platform_device *devices[] __initdata = {