aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-05-23 02:34:42 -0400
committerLennert Buytenhek <buytenh@marvell.com>2008-06-22 16:44:41 -0400
commit4fc338e38f08f0a91e35ab386abae48eb033dbb2 (patch)
tree9f7c87c87bcff36eb14bfe0a96df585f4589b9bd /arch/arm/mach-orion5x
parenta18b658449e6677aba2bf8dcd3593adecff6fe4d (diff)
[ARM] Orion: DRAM mapping granularity is 64KiB, not 16MiB
The DRAM base address and size fields in the CPU's MBUS bridge have 64KiB granularity, instead of the currently used 16MiB. Since all of the currently supported MBUS peripherals support 64KiB granularity as well, this patch changes the Orion address map code to stop rounding base addresses down and sizes up to multiples of 16MiB. Found by Ke Wei <kewei@marvell.com>. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r--arch/arm/mach-orion5x/addr-map.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 5ffbac9e1570..267e9f960a54 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -155,8 +155,8 @@ void __init orion5x_setup_cpu_mbus_bridge(void)
155 w = &orion5x_mbus_dram_info.cs[cs++]; 155 w = &orion5x_mbus_dram_info.cs[cs++];
156 w->cs_index = i; 156 w->cs_index = i;
157 w->mbus_attr = 0xf & ~(1 << i); 157 w->mbus_attr = 0xf & ~(1 << i);
158 w->base = base & 0xff000000; 158 w->base = base & 0xffff0000;
159 w->size = (size | 0x00ffffff) + 1; 159 w->size = (size | 0x0000ffff) + 1;
160 } 160 }
161 } 161 }
162 orion5x_mbus_dram_info.num_cs = cs; 162 orion5x_mbus_dram_info.num_cs = cs;