diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-08-03 18:25:12 +0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-08-11 02:03:59 +0400 |
| commit | 7153c360ebe5bcfb1e6b7980b90584c75c8c8e4d (patch) | |
| tree | a69308f57c165b0a9562a170f7d37c72338aebe7 /arch/arm/mach-orion5x | |
| parent | aec1bad326a99a8b0860fa9d518985ee388c9391 (diff) | |
| download | linux-7153c360ebe5bcfb1e6b7980b90584c75c8c8e4d.tar.xz | |
¶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>
Diffstat (limited to 'arch/arm/mach-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/addr-map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index d78731edebb6..1a5d6a0e2602 100644 --- 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; |