diff options
author | Zintis PÄ“tersons <zintis.petersons@abcsolutions.lv> | 2011-02-14 11:38:13 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-03 16:26:58 -0500 |
commit | 1ab6962794b4225b67bc3b6449f11a126f455fff (patch) | |
tree | 62b7494a8b47cf7c77108e0e787a1bad05344c86 /arch/arm/mach-kirkwood/ts41x-setup.c | |
parent | 9c15364f83201802e995cbf72d833e5e1b3b9adb (diff) |
[ARM] Kirkwood: initialize PCIE1 for QNAP TS-419P+
Initialize PCIE1 on the 6282-based QNAP TS-419P+ since it has a Marvell 9125
SATA chip on each PCI bus.
Signed-off-by: Zintis PÄ“tersons <zintis.petersons@abcsolutions.lv>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/ts41x-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/ts41x-setup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c index 9a44029915e2..0f84e0af397f 100644 --- a/arch/arm/mach-kirkwood/ts41x-setup.c +++ b/arch/arm/mach-kirkwood/ts41x-setup.c | |||
@@ -154,6 +154,8 @@ static void __init qnap_ts41x_init(void) | |||
154 | static int __init ts41x_pci_init(void) | 154 | static int __init ts41x_pci_init(void) |
155 | { | 155 | { |
156 | if (machine_is_ts41x()) { | 156 | if (machine_is_ts41x()) { |
157 | u32 dev, rev; | ||
158 | |||
157 | /* | 159 | /* |
158 | * Without this explicit reset, the PCIe SATA controller | 160 | * Without this explicit reset, the PCIe SATA controller |
159 | * (Marvell 88sx7042/sata_mv) is known to stop working | 161 | * (Marvell 88sx7042/sata_mv) is known to stop working |
@@ -161,7 +163,11 @@ static int __init ts41x_pci_init(void) | |||
161 | */ | 163 | */ |
162 | orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE); | 164 | orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE); |
163 | 165 | ||
164 | kirkwood_pcie_init(KW_PCIE0); | 166 | kirkwood_pcie_id(&dev, &rev); |
167 | if (dev == MV88F6282_DEV_ID) | ||
168 | kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); | ||
169 | else | ||
170 | kirkwood_pcie_init(KW_PCIE0); | ||
165 | } | 171 | } |
166 | 172 | ||
167 | return 0; | 173 | return 0; |