From bd20f47f87ec82fa73bafad0420e813a86cd2a7d Mon Sep 17 00:00:00 2001
From: Dmitry Artamonow <mad_soft@inbox.ru>
Date: Tue, 13 Mar 2012 09:46:27 +0400
Subject: [PATCH] --- yaml --- r: 295807 b: refs/heads/master c:
 2f926eecdfb6138fef91683667fc915af5071fff h: refs/heads/master i:   295805:
 838607232b5b32c55e49b17e67c7fdad5f3dd766   295803:
 a12abb74c65c06bc9af2a46da34bfcd6b60dffd7   295799:
 f9b054fd817ea1c7b18bf14432ebdb8c1c155308   295791:
 b1fba6e05ee8f646d8977d996b4436656bee4d14   295775:
 fb66185903e011af387243538cdd0e2d68d3c024   295743:
 ca61206edd11111613818e94fb4fa40f616cd598   295679:
 81aa1775b53af68c6cade1442bd8a791c624d3d2 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-tegra/pcie.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 72c49fbfcb0a..cf1e392e7b30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 795d5fd4b8b06944976c95e8592e17e2d415aa81
+refs/heads/master: 2f926eecdfb6138fef91683667fc915af5071fff
diff --git a/trunk/arch/arm/mach-tegra/pcie.c b/trunk/arch/arm/mach-tegra/pcie.c
index 0a1dec694394..91536996c3f0 100644
--- a/trunk/arch/arm/mach-tegra/pcie.c
+++ b/trunk/arch/arm/mach-tegra/pcie.c
@@ -639,10 +639,10 @@ static int tegra_pcie_enable_controller(void)
 	pads_writel(0xfa5cfa5c, 0xc8);
 
 	/* Wait for the PLL to lock */
-	timeout = 2000;
+	timeout = 300;
 	do {
 		val = pads_readl(PADS_PLL_CTL);
-		mdelay(1);
+		usleep_range(1000, 1000);
 		if (--timeout == 0) {
 			pr_err("Tegra PCIe error: timeout waiting for PLL\n");
 			return -EBUSY;
@@ -677,7 +677,7 @@ static int tegra_pcie_enable_controller(void)
 	/* Disable all execptions */
 	afi_writel(0, AFI_FPCI_ERROR_MASKS);
 
-	return;
+	return 0;
 }
 
 static void tegra_pcie_xclk_clamp(bool clamp)