Commit d5fdafd3 authored Mar 02, 2011 by Mike Rapoport Committed by Colin Cross Mar 03, 2011

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>

parent b96cc7fe

arch/arm/mach-tegra/board-trimslice.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);