[ARM] Kirkwood: initialize PCIE1 for QNAP TS-419P+

[pandora-kernel.git] / arch / arm / mach-kirkwood / ts41x-setup.c

diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
index 9a44029..0f84e0a 100644 (file)
--- 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;