From d5fdafd38ca0c28c4648909ce0afd0a5420309ca Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Wed, 2 Mar 2011 14:34:06 +0200 Subject: [PATCH] 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 Signed-off-by: Colin Cross --- arch/arm/mach-tegra/board-trimslice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 0f3081a9712..7be7d4acd02 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); -- 2.39.2