Commit d5fdafd3 authored by Mike Rapoport's avatar Mike Rapoport Committed by Colin Cross

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: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarColin Cross <ccross@android.com>
parent b96cc7fe
...@@ -79,6 +79,9 @@ static __initdata struct tegra_clk_init_table trimslice_clk_init_table[] = { ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment