diff options
| author | Mike Rapoport <mike@compulab.co.il> | 2011-03-02 14:34:06 +0200 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-03-03 13:57:31 -0800 |
| commit | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (patch) | |
| tree | 88289a5e28ae24381af7fd1c69712ae8bca7f165 /arch | |
| parent | b96cc7fe190b9356633c70afae61ee0637b000ee (diff) | |
| download | linux-stable-d5fdafd38ca0c28c4648909ce0afd0a5420309ca.tar.gz linux-stable-d5fdafd38ca0c28c4648909ce0afd0a5420309ca.tar.bz2 linux-stable-d5fdafd38ca0c28c4648909ce0afd0a5420309ca.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 0f3081a97126..7be7d4acd02f 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); |