drivers: usb: fsl: Modify phy clk valid bit checking

Phy_clk_valid bit is checked only when the boolean
property phy-clk-valid in present in usb node device tree.
This property is added to the usb node via device tree fixup.

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index b04c9dbd5c7dbdd08e090fc0fd8c899513a85189..05ebe3dcd61885c5fc683a7c7db019035d23a87a 100644 (file)
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -230,14 +230,14 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
                break;
        }
 
-       if (pdata->have_sysif_regs &&
-           pdata->controller_ver > FSL_USB_VER_1_6 &&
-           (phy_mode == FSL_USB2_PHY_ULPI)) {
-               /* check PHY_CLK_VALID to get phy clk valid */
-               if (!(spin_event_timeout(in_be32(non_ehci + FSL_SOC_USB_CTRL) &
-                               PHY_CLK_VALID, FSL_USB_PHY_CLK_TIMEOUT, 0) ||
-                               in_be32(non_ehci + FSL_SOC_USB_PRICTRL))) {
-                       dev_warn(hcd->self.controller, "USB PHY clock invalid\n");
+       /*
+        * check PHY_CLK_VALID to determine phy clock presence before writing
+        * to portsc
+        */
+       if (pdata->check_phy_clk_valid) {
+               if (!(in_be32(non_ehci + FSL_SOC_USB_CTRL) & PHY_CLK_VALID)) {
+                       dev_warn(hcd->self.controller,
+                                "USB PHY clock invalid\n");
                        return -EINVAL;
                }
        }

diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 631fc504afdaaf250dc844dcf704e9bde0625cce..9f731413ab3edd7f25ab139e39409c9f2c63dc61 100644 (file)
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -222,6 +222,15 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
        else
                pdata->has_fsl_erratum_a007792 = 0;
 
+       /*
+        * Determine whether phy_clk_valid needs to be checked
+        * by reading property in device tree
+        */
+       if (of_get_property(np, "phy-clk-valid", NULL))
+               pdata->check_phy_clk_valid = 1;
+       else
+               pdata->check_phy_clk_valid = 0;
+
        if (pdata->have_sysif_regs) {
                if (pdata->controller_ver == FSL_USB_VER_NONE) {
                        dev_warn(&ofdev->dev, "Could not get controller version\n");

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 070d9aef90a79ab9a2bc33448127427ffd2ca2ad..cebdbbb4aa6901870fd0706b4434f4f676f3176c 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -99,6 +99,7 @@ struct fsl_usb2_platform_data {
        unsigned        suspended:1;
        unsigned        already_suspended:1;
        unsigned        has_fsl_erratum_a007792:1;
+       unsigned        check_phy_clk_valid:1;
 
        /* register save area for suspend/resume */
        u32             pm_command;