diff options
| author | Zintis Pētersons <zintis.petersons@abcsolutions.lv> | 2011-02-14 16:38:13 (GMT) |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-03 21:26:58 (GMT) |
| commit | 1ab6962794b4225b67bc3b6449f11a126f455fff (patch) | |
| tree | 62b7494a8b47cf7c77108e0e787a1bad05344c86 | |
| parent | 9c15364f83201802e995cbf72d833e5e1b3b9adb (diff) | |
| download | linux-1ab6962794b4225b67bc3b6449f11a126f455fff.tar.xz | |
[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>
| -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 9a44029..0f84e0a 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) static int __init ts41x_pci_init(void) { if (machine_is_ts41x()) { + u32 dev, rev; + /* * Without this explicit reset, the PCIe SATA controller * (Marvell 88sx7042/sata_mv) is known to stop working @@ -161,7 +163,11 @@ static int __init ts41x_pci_init(void) */ orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE); - kirkwood_pcie_init(KW_PCIE0); + kirkwood_pcie_id(&dev, &rev); + if (dev == MV88F6282_DEV_ID) + kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); + else + kirkwood_pcie_init(KW_PCIE0); } return 0; |