diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-18 10:35:53 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-18 10:35:53 -0700 |
| commit | e8ce8f96d06fab569f7d86207fa9f5db1afafa5f (patch) | |
| tree | d91da0546be71a3f7c04738cf51ff405f581a8f5 | |
| parent | 1233655898249cb54453351abc05ecf64bb09025 (diff) | |
| parent | 279b658525abd06645938fb607860de42c4cf31e (diff) | |
| download | tegra-for-next.tar.gz | |
Merge branch 'for-3.4/cleanup-and-fixes' into for-nextfor-next
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pcie.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index d2cb4b037f7f3..6ae78821fd8ed 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -8,7 +8,7 @@ config ARCH_TEGRA_2x_SOC select ARM_GIC select ARCH_REQUIRE_GPIOLIB select USB_ARCH_HAS_EHCI if USB_SUPPORT - select USB_ULPI if USB_SUPPORT + select USB_ULPI if USB select USB_ULPI_VIEWPORT if USB_SUPPORT select ARM_ERRATA_720789 select ARM_ERRATA_742230 @@ -28,7 +28,7 @@ config ARCH_TEGRA_3x_SOC select ARM_GIC select ARCH_REQUIRE_GPIOLIB select USB_ARCH_HAS_EHCI if USB_SUPPORT - select USB_ULPI if USB_SUPPORT + select USB_ULPI if USB select USB_ULPI_VIEWPORT if USB_SUPPORT select USE_OF select ARM_ERRATA_743622 diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 0a1dec6943943..91536996c3f0e 100644 --- a/arch/arm/mach-tegra/pcie.c +++ b/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) |