Skip to content

Commit

Permalink
ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Rapoport authored and Colin Cross committed Mar 3, 2011
1 parent b96cc7f commit d5fdafd
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/arm/mach-tegra/board-trimslice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d5fdafd

Please sign in to comment.