Browse Source

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>
Mike Rapoport 14 years ago
parent
commit
d5fdafd38c
1 changed files with 3 additions and 0 deletions
  1. 3 0
      arch/arm/mach-tegra/board-trimslice.c

+ 3 - 0
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)
 static int __init tegra_trimslice_pci_init(void)
 {
 {
+	if (!machine_is_trimslice())
+		return 0;
+
 	return tegra_pcie_init(true, true);
 	return tegra_pcie_init(true, true);
 }
 }
 subsys_initcall(tegra_trimslice_pci_init);
 subsys_initcall(tegra_trimslice_pci_init);