From 9b1ea331d252d5f15103e5a0b68edbc8eeaf3e22 Mon Sep 17 00:00:00 2001 From: Shengzhou Liu Date: Mon, 24 Sep 2012 22:01:35 +0800 Subject: [PATCH] --- yaml --- r: 326133 b: refs/heads/master c: 5ed338778f917a035f0f0a52327fc4f72e36f7a1 h: refs/heads/master i: 326131: 98659053a564a437abc8ed7201c310547ced1570 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-fsl.c | 3 +-- trunk/include/linux/fsl_devices.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b93923b0806c..f45aa0af67fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54575b05af36959dfb6a49a3e9ca0c2b456b7126 +refs/heads/master: 5ed338778f917a035f0f0a52327fc4f72e36f7a1 diff --git a/trunk/drivers/usb/host/ehci-fsl.c b/trunk/drivers/usb/host/ehci-fsl.c index 11ff4b4dc7ad..9bfde82078ec 100644 --- a/trunk/drivers/usb/host/ehci-fsl.c +++ b/trunk/drivers/usb/host/ehci-fsl.c @@ -267,8 +267,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd, break; } - if ((pdata->controller_ver) && ((phy_mode == FSL_USB2_PHY_ULPI) || - (phy_mode == FSL_USB2_PHY_UTMI))) { + if (pdata->controller_ver && (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)) { diff --git a/trunk/include/linux/fsl_devices.h b/trunk/include/linux/fsl_devices.h index 38b5660813ff..a82296af413f 100644 --- a/trunk/include/linux/fsl_devices.h +++ b/trunk/include/linux/fsl_devices.h @@ -19,7 +19,7 @@ #define FSL_UTMI_PHY_DLY 10 /*As per P1010RM, delay for UTMI PHY CLK to become stable - 10ms*/ -#define FSL_USB_PHY_CLK_TIMEOUT 1000 /* uSec */ +#define FSL_USB_PHY_CLK_TIMEOUT 10000 /* uSec */ #define FSL_USB_VER_OLD 0 #define FSL_USB_VER_1_6 1 #define FSL_USB_VER_2_2 2