diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
| commit | 3c76a8a95daeecd881718f88324041f6a5faab86 (patch) | |
| tree | 89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/plat-orion/addr-map.c | |
| parent | 513a7917b13370d9fbc41331413428dd713cb3fc (diff) | |
| parent | 600468d0686096ddc1000c8a2e69475931084414 (diff) | |
| download | talos-op-linux-3c76a8a95daeecd881718f88324041f6a5faab86.tar.gz talos-op-linux-3c76a8a95daeecd881718f88324041f6a5faab86.zip | |
Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
pulling in mvebu branches which changes armada*.dts? files for LPAE changes
mvebu fixes for v3.9 round 3
- Kirkwood
- a couple of small fixes for the Iomega ix2-200 board (ether and led)
- mvebu
- allow GPIO button to work on Mirabox when running SMP
Diffstat (limited to 'arch/arm/plat-orion/addr-map.c')
| -rw-r--r-- | arch/arm/plat-orion/addr-map.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c index febe3862873c..807ac8e5cbc0 100644 --- a/arch/arm/plat-orion/addr-map.c +++ b/arch/arm/plat-orion/addr-map.c @@ -157,9 +157,12 @@ void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg, u32 size = readl(ddr_window_cpu_base + DDR_SIZE_CS_OFF(i)); /* - * Chip select enabled? + * We only take care of entries for which the chip + * select is enabled, and that don't have high base + * address bits set (devices can only access the first + * 32 bits of the memory). */ - if (size & 1) { + if ((size & 1) && !(base & 0xF)) { struct mbus_dram_window *w; w = &orion_mbus_dram_info.cs[cs++]; |
