aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/addr-map.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-05-28 10:43:48 -0400
committerLennert Buytenhek <buytenh@marvell.com>2008-06-22 16:44:57 -0400
commit79e90dd5aa95adfdc3117db8a559da3d0195ba58 (patch)
treebe2a760b39e8f295aca136da03c05490c77a0b48 /arch/arm/mach-orion5x/addr-map.c
parent0e3bc0503f7e7b5b0bd4416f43eeeca1b661e66e (diff)
[ARM] Orion: nuke orion5x_{read,write}
Nuke the Orion-specific orion5x_{read,write} wrappers. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/addr-map.c')
-rw-r--r--arch/arm/mach-orion5x/addr-map.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 267e9f960a54..6f0dbda6c44c 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -94,16 +94,16 @@ static void __init setup_cpu_win(int win, u32 base, u32 size,
94 return; 94 return;
95 } 95 }
96 96
97 orion5x_write(CPU_WIN_BASE(win), base & 0xffff0000); 97 writel(base & 0xffff0000, CPU_WIN_BASE(win));
98 orion5x_write(CPU_WIN_CTRL(win), 98 writel(((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1,
99 ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1); 99 CPU_WIN_CTRL(win));
100 100
101 if (orion5x_cpu_win_can_remap(win)) { 101 if (orion5x_cpu_win_can_remap(win)) {
102 if (remap < 0) 102 if (remap < 0)
103 remap = base; 103 remap = base;
104 104
105 orion5x_write(CPU_WIN_REMAP_LO(win), remap & 0xffff0000); 105 writel(remap & 0xffff0000, CPU_WIN_REMAP_LO(win));
106 orion5x_write(CPU_WIN_REMAP_HI(win), 0); 106 writel(0, CPU_WIN_REMAP_HI(win));
107 } 107 }
108} 108}
109 109
@@ -116,11 +116,11 @@ void __init orion5x_setup_cpu_mbus_bridge(void)
116 * First, disable and clear windows. 116 * First, disable and clear windows.
117 */ 117 */
118 for (i = 0; i < 8; i++) { 118 for (i = 0; i < 8; i++) {
119 orion5x_write(CPU_WIN_BASE(i), 0); 119 writel(0, CPU_WIN_BASE(i));
120 orion5x_write(CPU_WIN_CTRL(i), 0); 120 writel(0, CPU_WIN_CTRL(i));
121 if (orion5x_cpu_win_can_remap(i)) { 121 if (orion5x_cpu_win_can_remap(i)) {
122 orion5x_write(CPU_WIN_REMAP_LO(i), 0); 122 writel(0, CPU_WIN_REMAP_LO(i));
123 orion5x_write(CPU_WIN_REMAP_HI(i), 0); 123 writel(0, CPU_WIN_REMAP_HI(i));
124 } 124 }
125 } 125 }
126 126