¶ARM] Orion5x: fix cpu window mapping for 88f6183

On the 88f6183, orion5x's setup_cpu_win() fails to ever program any
mbus bridge remap registers, which causes transactions for PCI/PCIe
IO/MEM space to get sent to random mbus targets.  Adding a check for
the 6183 in orion5x_cpu_win_can_remap() is necessary and sufficient
to make PCIe wlan cards work on the 6183 reference design.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index d78731edebb698b01edf297d29c5f9ef0cc73455..1a5d6a0e26026f4927495dc04a7f403d10155359 100644 (file)
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -84,7 +84,8 @@ static int __init orion5x_cpu_win_can_remap(int win)
        orion5x_pcie_id(&dev, &rev);
        if ((dev == MV88F5281_DEV_ID && win < 4)
            || (dev == MV88F5182_DEV_ID && win < 2)
-           || (dev == MV88F5181_DEV_ID && win < 2))
+           || (dev == MV88F5181_DEV_ID && win < 2)
+           || (dev == MV88F6183_DEV_ID && win < 4))
                return 1;
 
        return 0;