From: Mike Rapoport <mike@compulab.co.il>
Date: Wed, 2 Mar 2011 12:34:06 +0000 (+0200)
Subject: ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d5fdafd38ca0c28c4648909ce0afd0a5420309ca;p=linux-beck.git

ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice

Currently tegra_pcie_init is effectively called as subsys_initcall. With
multiplatform kernel this may cause hangs on boards that don't intend to
support Tegra2 PCI-e. Ensure that TrimSlice board code initializes PCI-e
only when actually running on the TrimSlice.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index 0f3081a97126..7be7d4acd02f 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -79,6 +79,9 @@ static __initdata struct tegra_clk_init_table trimslice_clk_init_table[] = {
 
 static int __init tegra_trimslice_pci_init(void)
 {
+	if (!machine_is_trimslice())
+		return 0;
+
 	return tegra_pcie_init(true, true);
 }
 subsys_initcall(tegra_trimslice_pci_init);