diff options
Diffstat (limited to 'arch/arm/mach-spear6xx/spear6xx.c')
-rw-r--r-- | arch/arm/mach-spear6xx/spear6xx.c | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index 2e2e3596583e..b59ae5369e7b 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c | |||
@@ -36,336 +36,288 @@ static struct pl08x_channel_data spear600_dma_info[] = { | |||
36 | .min_signal = 0, | 36 | .min_signal = 0, |
37 | .max_signal = 0, | 37 | .max_signal = 0, |
38 | .muxval = 0, | 38 | .muxval = 0, |
39 | .cctl = 0, | ||
40 | .periph_buses = PL08X_AHB1, | 39 | .periph_buses = PL08X_AHB1, |
41 | }, { | 40 | }, { |
42 | .bus_id = "ssp1_tx", | 41 | .bus_id = "ssp1_tx", |
43 | .min_signal = 1, | 42 | .min_signal = 1, |
44 | .max_signal = 1, | 43 | .max_signal = 1, |
45 | .muxval = 0, | 44 | .muxval = 0, |
46 | .cctl = 0, | ||
47 | .periph_buses = PL08X_AHB1, | 45 | .periph_buses = PL08X_AHB1, |
48 | }, { | 46 | }, { |
49 | .bus_id = "uart0_rx", | 47 | .bus_id = "uart0_rx", |
50 | .min_signal = 2, | 48 | .min_signal = 2, |
51 | .max_signal = 2, | 49 | .max_signal = 2, |
52 | .muxval = 0, | 50 | .muxval = 0, |
53 | .cctl = 0, | ||
54 | .periph_buses = PL08X_AHB1, | 51 | .periph_buses = PL08X_AHB1, |
55 | }, { | 52 | }, { |
56 | .bus_id = "uart0_tx", | 53 | .bus_id = "uart0_tx", |
57 | .min_signal = 3, | 54 | .min_signal = 3, |
58 | .max_signal = 3, | 55 | .max_signal = 3, |
59 | .muxval = 0, | 56 | .muxval = 0, |
60 | .cctl = 0, | ||
61 | .periph_buses = PL08X_AHB1, | 57 | .periph_buses = PL08X_AHB1, |
62 | }, { | 58 | }, { |
63 | .bus_id = "uart1_rx", | 59 | .bus_id = "uart1_rx", |
64 | .min_signal = 4, | 60 | .min_signal = 4, |
65 | .max_signal = 4, | 61 | .max_signal = 4, |
66 | .muxval = 0, | 62 | .muxval = 0, |
67 | .cctl = 0, | ||
68 | .periph_buses = PL08X_AHB1, | 63 | .periph_buses = PL08X_AHB1, |
69 | }, { | 64 | }, { |
70 | .bus_id = "uart1_tx", | 65 | .bus_id = "uart1_tx", |
71 | .min_signal = 5, | 66 | .min_signal = 5, |
72 | .max_signal = 5, | 67 | .max_signal = 5, |
73 | .muxval = 0, | 68 | .muxval = 0, |
74 | .cctl = 0, | ||
75 | .periph_buses = PL08X_AHB1, | 69 | .periph_buses = PL08X_AHB1, |
76 | }, { | 70 | }, { |
77 | .bus_id = "ssp2_rx", | 71 | .bus_id = "ssp2_rx", |
78 | .min_signal = 6, | 72 | .min_signal = 6, |
79 | .max_signal = 6, | 73 | .max_signal = 6, |
80 | .muxval = 0, | 74 | .muxval = 0, |
81 | .cctl = 0, | ||
82 | .periph_buses = PL08X_AHB2, | 75 | .periph_buses = PL08X_AHB2, |
83 | }, { | 76 | }, { |
84 | .bus_id = "ssp2_tx", | 77 | .bus_id = "ssp2_tx", |
85 | .min_signal = 7, | 78 | .min_signal = 7, |
86 | .max_signal = 7, | 79 | .max_signal = 7, |
87 | .muxval = 0, | 80 | .muxval = 0, |
88 | .cctl = 0, | ||
89 | .periph_buses = PL08X_AHB2, | 81 | .periph_buses = PL08X_AHB2, |
90 | }, { | 82 | }, { |
91 | .bus_id = "ssp0_rx", | 83 | .bus_id = "ssp0_rx", |
92 | .min_signal = 8, | 84 | .min_signal = 8, |
93 | .max_signal = 8, | 85 | .max_signal = 8, |
94 | .muxval = 0, | 86 | .muxval = 0, |
95 | .cctl = 0, | ||
96 | .periph_buses = PL08X_AHB1, | 87 | .periph_buses = PL08X_AHB1, |
97 | }, { | 88 | }, { |
98 | .bus_id = "ssp0_tx", | 89 | .bus_id = "ssp0_tx", |
99 | .min_signal = 9, | 90 | .min_signal = 9, |
100 | .max_signal = 9, | 91 | .max_signal = 9, |
101 | .muxval = 0, | 92 | .muxval = 0, |
102 | .cctl = 0, | ||
103 | .periph_buses = PL08X_AHB1, | 93 | .periph_buses = PL08X_AHB1, |
104 | }, { | 94 | }, { |
105 | .bus_id = "i2c_rx", | 95 | .bus_id = "i2c_rx", |
106 | .min_signal = 10, | 96 | .min_signal = 10, |
107 | .max_signal = 10, | 97 | .max_signal = 10, |
108 | .muxval = 0, | 98 | .muxval = 0, |
109 | .cctl = 0, | ||
110 | .periph_buses = PL08X_AHB1, | 99 | .periph_buses = PL08X_AHB1, |
111 | }, { | 100 | }, { |
112 | .bus_id = "i2c_tx", | 101 | .bus_id = "i2c_tx", |
113 | .min_signal = 11, | 102 | .min_signal = 11, |
114 | .max_signal = 11, | 103 | .max_signal = 11, |
115 | .muxval = 0, | 104 | .muxval = 0, |
116 | .cctl = 0, | ||
117 | .periph_buses = PL08X_AHB1, | 105 | .periph_buses = PL08X_AHB1, |
118 | }, { | 106 | }, { |
119 | .bus_id = "irda", | 107 | .bus_id = "irda", |
120 | .min_signal = 12, | 108 | .min_signal = 12, |
121 | .max_signal = 12, | 109 | .max_signal = 12, |
122 | .muxval = 0, | 110 | .muxval = 0, |
123 | .cctl = 0, | ||
124 | .periph_buses = PL08X_AHB1, | 111 | .periph_buses = PL08X_AHB1, |
125 | }, { | 112 | }, { |
126 | .bus_id = "adc", | 113 | .bus_id = "adc", |
127 | .min_signal = 13, | 114 | .min_signal = 13, |
128 | .max_signal = 13, | 115 | .max_signal = 13, |
129 | .muxval = 0, | 116 | .muxval = 0, |
130 | .cctl = 0, | ||
131 | .periph_buses = PL08X_AHB2, | 117 | .periph_buses = PL08X_AHB2, |
132 | }, { | 118 | }, { |
133 | .bus_id = "to_jpeg", | 119 | .bus_id = "to_jpeg", |
134 | .min_signal = 14, | 120 | .min_signal = 14, |
135 | .max_signal = 14, | 121 | .max_signal = 14, |
136 | .muxval = 0, | 122 | .muxval = 0, |
137 | .cctl = 0, | ||
138 | .periph_buses = PL08X_AHB1, | 123 | .periph_buses = PL08X_AHB1, |
139 | }, { | 124 | }, { |
140 | .bus_id = "from_jpeg", | 125 | .bus_id = "from_jpeg", |
141 | .min_signal = 15, | 126 | .min_signal = 15, |
142 | .max_signal = 15, | 127 | .max_signal = 15, |
143 | .muxval = 0, | 128 | .muxval = 0, |
144 | .cctl = 0, | ||
145 | .periph_buses = PL08X_AHB1, | 129 | .periph_buses = PL08X_AHB1, |
146 | }, { | 130 | }, { |
147 | .bus_id = "ras0_rx", | 131 | .bus_id = "ras0_rx", |
148 | .min_signal = 0, | 132 | .min_signal = 0, |
149 | .max_signal = 0, | 133 | .max_signal = 0, |
150 | .muxval = 1, | 134 | .muxval = 1, |
151 | .cctl = 0, | ||
152 | .periph_buses = PL08X_AHB1, | 135 | .periph_buses = PL08X_AHB1, |
153 | }, { | 136 | }, { |
154 | .bus_id = "ras0_tx", | 137 | .bus_id = "ras0_tx", |
155 | .min_signal = 1, | 138 | .min_signal = 1, |
156 | .max_signal = 1, | 139 | .max_signal = 1, |
157 | .muxval = 1, | 140 | .muxval = 1, |
158 | .cctl = 0, | ||
159 | .periph_buses = PL08X_AHB1, | 141 | .periph_buses = PL08X_AHB1, |
160 | }, { | 142 | }, { |
161 | .bus_id = "ras1_rx", | 143 | .bus_id = "ras1_rx", |
162 | .min_signal = 2, | 144 | .min_signal = 2, |
163 | .max_signal = 2, | 145 | .max_signal = 2, |
164 | .muxval = 1, | 146 | .muxval = 1, |
165 | .cctl = 0, | ||
166 | .periph_buses = PL08X_AHB1, | 147 | .periph_buses = PL08X_AHB1, |
167 | }, { | 148 | }, { |
168 | .bus_id = "ras1_tx", | 149 | .bus_id = "ras1_tx", |
169 | .min_signal = 3, | 150 | .min_signal = 3, |
170 | .max_signal = 3, | 151 | .max_signal = 3, |
171 | .muxval = 1, | 152 | .muxval = 1, |
172 | .cctl = 0, | ||
173 | .periph_buses = PL08X_AHB1, | 153 | .periph_buses = PL08X_AHB1, |
174 | }, { | 154 | }, { |
175 | .bus_id = "ras2_rx", | 155 | .bus_id = "ras2_rx", |
176 | .min_signal = 4, | 156 | .min_signal = 4, |
177 | .max_signal = 4, | 157 | .max_signal = 4, |
178 | .muxval = 1, | 158 | .muxval = 1, |
179 | .cctl = 0, | ||
180 | .periph_buses = PL08X_AHB1, | 159 | .periph_buses = PL08X_AHB1, |
181 | }, { | 160 | }, { |
182 | .bus_id = "ras2_tx", | 161 | .bus_id = "ras2_tx", |
183 | .min_signal = 5, | 162 | .min_signal = 5, |
184 | .max_signal = 5, | 163 | .max_signal = 5, |
185 | .muxval = 1, | 164 | .muxval = 1, |
186 | .cctl = 0, | ||
187 | .periph_buses = PL08X_AHB1, | 165 | .periph_buses = PL08X_AHB1, |
188 | }, { | 166 | }, { |
189 | .bus_id = "ras3_rx", | 167 | .bus_id = "ras3_rx", |
190 | .min_signal = 6, | 168 | .min_signal = 6, |
191 | .max_signal = 6, | 169 | .max_signal = 6, |
192 | .muxval = 1, | 170 | .muxval = 1, |
193 | .cctl = 0, | ||
194 | .periph_buses = PL08X_AHB1, | 171 | .periph_buses = PL08X_AHB1, |
195 | }, { | 172 | }, { |
196 | .bus_id = "ras3_tx", | 173 | .bus_id = "ras3_tx", |
197 | .min_signal = 7, | 174 | .min_signal = 7, |
198 | .max_signal = 7, | 175 | .max_signal = 7, |
199 | .muxval = 1, | 176 | .muxval = 1, |
200 | .cctl = 0, | ||
201 | .periph_buses = PL08X_AHB1, | 177 | .periph_buses = PL08X_AHB1, |
202 | }, { | 178 | }, { |
203 | .bus_id = "ras4_rx", | 179 | .bus_id = "ras4_rx", |
204 | .min_signal = 8, | 180 | .min_signal = 8, |
205 | .max_signal = 8, | 181 | .max_signal = 8, |
206 | .muxval = 1, | 182 | .muxval = 1, |
207 | .cctl = 0, | ||
208 | .periph_buses = PL08X_AHB1, | 183 | .periph_buses = PL08X_AHB1, |
209 | }, { | 184 | }, { |
210 | .bus_id = "ras4_tx", | 185 | .bus_id = "ras4_tx", |
211 | .min_signal = 9, | 186 | .min_signal = 9, |
212 | .max_signal = 9, | 187 | .max_signal = 9, |
213 | .muxval = 1, | 188 | .muxval = 1, |
214 | .cctl = 0, | ||
215 | .periph_buses = PL08X_AHB1, | 189 | .periph_buses = PL08X_AHB1, |
216 | }, { | 190 | }, { |
217 | .bus_id = "ras5_rx", | 191 | .bus_id = "ras5_rx", |
218 | .min_signal = 10, | 192 | .min_signal = 10, |
219 | .max_signal = 10, | 193 | .max_signal = 10, |
220 | .muxval = 1, | 194 | .muxval = 1, |
221 | .cctl = 0, | ||
222 | .periph_buses = PL08X_AHB1, | 195 | .periph_buses = PL08X_AHB1, |
223 | }, { | 196 | }, { |
224 | .bus_id = "ras5_tx", | 197 | .bus_id = "ras5_tx", |
225 | .min_signal = 11, | 198 | .min_signal = 11, |
226 | .max_signal = 11, | 199 | .max_signal = 11, |
227 | .muxval = 1, | 200 | .muxval = 1, |
228 | .cctl = 0, | ||
229 | .periph_buses = PL08X_AHB1, | 201 | .periph_buses = PL08X_AHB1, |
230 | }, { | 202 | }, { |
231 | .bus_id = "ras6_rx", | 203 | .bus_id = "ras6_rx", |
232 | .min_signal = 12, | 204 | .min_signal = 12, |
233 | .max_signal = 12, | 205 | .max_signal = 12, |
234 | .muxval = 1, | 206 | .muxval = 1, |
235 | .cctl = 0, | ||
236 | .periph_buses = PL08X_AHB1, | 207 | .periph_buses = PL08X_AHB1, |
237 | }, { | 208 | }, { |
238 | .bus_id = "ras6_tx", | 209 | .bus_id = "ras6_tx", |
239 | .min_signal = 13, | 210 | .min_signal = 13, |
240 | .max_signal = 13, | 211 | .max_signal = 13, |
241 | .muxval = 1, | 212 | .muxval = 1, |
242 | .cctl = 0, | ||
243 | .periph_buses = PL08X_AHB1, | 213 | .periph_buses = PL08X_AHB1, |
244 | }, { | 214 | }, { |
245 | .bus_id = "ras7_rx", | 215 | .bus_id = "ras7_rx", |
246 | .min_signal = 14, | 216 | .min_signal = 14, |
247 | .max_signal = 14, | 217 | .max_signal = 14, |
248 | .muxval = 1, | 218 | .muxval = 1, |
249 | .cctl = 0, | ||
250 | .periph_buses = PL08X_AHB1, | 219 | .periph_buses = PL08X_AHB1, |
251 | }, { | 220 | }, { |
252 | .bus_id = "ras7_tx", | 221 | .bus_id = "ras7_tx", |
253 | .min_signal = 15, | 222 | .min_signal = 15, |
254 | .max_signal = 15, | 223 | .max_signal = 15, |
255 | .muxval = 1, | 224 | .muxval = 1, |
256 | .cctl = 0, | ||
257 | .periph_buses = PL08X_AHB1, | 225 | .periph_buses = PL08X_AHB1, |
258 | }, { | 226 | }, { |
259 | .bus_id = "ext0_rx", | 227 | .bus_id = "ext0_rx", |
260 | .min_signal = 0, | 228 | .min_signal = 0, |
261 | .max_signal = 0, | 229 | .max_signal = 0, |
262 | .muxval = 2, | 230 | .muxval = 2, |
263 | .cctl = 0, | ||
264 | .periph_buses = PL08X_AHB2, | 231 | .periph_buses = PL08X_AHB2, |
265 | }, { | 232 | }, { |
266 | .bus_id = "ext0_tx", | 233 | .bus_id = "ext0_tx", |
267 | .min_signal = 1, | 234 | .min_signal = 1, |
268 | .max_signal = 1, | 235 | .max_signal = 1, |
269 | .muxval = 2, | 236 | .muxval = 2, |
270 | .cctl = 0, | ||
271 | .periph_buses = PL08X_AHB2, | 237 | .periph_buses = PL08X_AHB2, |
272 | }, { | 238 | }, { |
273 | .bus_id = "ext1_rx", | 239 | .bus_id = "ext1_rx", |
274 | .min_signal = 2, | 240 | .min_signal = 2, |
275 | .max_signal = 2, | 241 | .max_signal = 2, |
276 | .muxval = 2, | 242 | .muxval = 2, |
277 | .cctl = 0, | ||
278 | .periph_buses = PL08X_AHB2, | 243 | .periph_buses = PL08X_AHB2, |
279 | }, { | 244 | }, { |
280 | .bus_id = "ext1_tx", | 245 | .bus_id = "ext1_tx", |
281 | .min_signal = 3, | 246 | .min_signal = 3, |
282 | .max_signal = 3, | 247 | .max_signal = 3, |
283 | .muxval = 2, | 248 | .muxval = 2, |
284 | .cctl = 0, | ||
285 | .periph_buses = PL08X_AHB2, | 249 | .periph_buses = PL08X_AHB2, |
286 | }, { | 250 | }, { |
287 | .bus_id = "ext2_rx", | 251 | .bus_id = "ext2_rx", |
288 | .min_signal = 4, | 252 | .min_signal = 4, |
289 | .max_signal = 4, | 253 | .max_signal = 4, |
290 | .muxval = 2, | 254 | .muxval = 2, |
291 | .cctl = 0, | ||
292 | .periph_buses = PL08X_AHB2, | 255 | .periph_buses = PL08X_AHB2, |
293 | }, { | 256 | }, { |
294 | .bus_id = "ext2_tx", | 257 | .bus_id = "ext2_tx", |
295 | .min_signal = 5, | 258 | .min_signal = 5, |
296 | .max_signal = 5, | 259 | .max_signal = 5, |
297 | .muxval = 2, | 260 | .muxval = 2, |
298 | .cctl = 0, | ||
299 | .periph_buses = PL08X_AHB2, | 261 | .periph_buses = PL08X_AHB2, |
300 | }, { | 262 | }, { |
301 | .bus_id = "ext3_rx", | 263 | .bus_id = "ext3_rx", |
302 | .min_signal = 6, | 264 | .min_signal = 6, |
303 | .max_signal = 6, | 265 | .max_signal = 6, |
304 | .muxval = 2, | 266 | .muxval = 2, |
305 | .cctl = 0, | ||
306 | .periph_buses = PL08X_AHB2, | 267 | .periph_buses = PL08X_AHB2, |
307 | }, { | 268 | }, { |
308 | .bus_id = "ext3_tx", | 269 | .bus_id = "ext3_tx", |
309 | .min_signal = 7, | 270 | .min_signal = 7, |
310 | .max_signal = 7, | 271 | .max_signal = 7, |
311 | .muxval = 2, | 272 | .muxval = 2, |
312 | .cctl = 0, | ||
313 | .periph_buses = PL08X_AHB2, | 273 | .periph_buses = PL08X_AHB2, |
314 | }, { | 274 | }, { |
315 | .bus_id = "ext4_rx", | 275 | .bus_id = "ext4_rx", |
316 | .min_signal = 8, | 276 | .min_signal = 8, |
317 | .max_signal = 8, | 277 | .max_signal = 8, |
318 | .muxval = 2, | 278 | .muxval = 2, |
319 | .cctl = 0, | ||
320 | .periph_buses = PL08X_AHB2, | 279 | .periph_buses = PL08X_AHB2, |
321 | }, { | 280 | }, { |
322 | .bus_id = "ext4_tx", | 281 | .bus_id = "ext4_tx", |
323 | .min_signal = 9, | 282 | .min_signal = 9, |
324 | .max_signal = 9, | 283 | .max_signal = 9, |
325 | .muxval = 2, | 284 | .muxval = 2, |
326 | .cctl = 0, | ||
327 | .periph_buses = PL08X_AHB2, | 285 | .periph_buses = PL08X_AHB2, |
328 | }, { | 286 | }, { |
329 | .bus_id = "ext5_rx", | 287 | .bus_id = "ext5_rx", |
330 | .min_signal = 10, | 288 | .min_signal = 10, |
331 | .max_signal = 10, | 289 | .max_signal = 10, |
332 | .muxval = 2, | 290 | .muxval = 2, |
333 | .cctl = 0, | ||
334 | .periph_buses = PL08X_AHB2, | 291 | .periph_buses = PL08X_AHB2, |
335 | }, { | 292 | }, { |
336 | .bus_id = "ext5_tx", | 293 | .bus_id = "ext5_tx", |
337 | .min_signal = 11, | 294 | .min_signal = 11, |
338 | .max_signal = 11, | 295 | .max_signal = 11, |
339 | .muxval = 2, | 296 | .muxval = 2, |
340 | .cctl = 0, | ||
341 | .periph_buses = PL08X_AHB2, | 297 | .periph_buses = PL08X_AHB2, |
342 | }, { | 298 | }, { |
343 | .bus_id = "ext6_rx", | 299 | .bus_id = "ext6_rx", |
344 | .min_signal = 12, | 300 | .min_signal = 12, |
345 | .max_signal = 12, | 301 | .max_signal = 12, |
346 | .muxval = 2, | 302 | .muxval = 2, |
347 | .cctl = 0, | ||
348 | .periph_buses = PL08X_AHB2, | 303 | .periph_buses = PL08X_AHB2, |
349 | }, { | 304 | }, { |
350 | .bus_id = "ext6_tx", | 305 | .bus_id = "ext6_tx", |
351 | .min_signal = 13, | 306 | .min_signal = 13, |
352 | .max_signal = 13, | 307 | .max_signal = 13, |
353 | .muxval = 2, | 308 | .muxval = 2, |
354 | .cctl = 0, | ||
355 | .periph_buses = PL08X_AHB2, | 309 | .periph_buses = PL08X_AHB2, |
356 | }, { | 310 | }, { |
357 | .bus_id = "ext7_rx", | 311 | .bus_id = "ext7_rx", |
358 | .min_signal = 14, | 312 | .min_signal = 14, |
359 | .max_signal = 14, | 313 | .max_signal = 14, |
360 | .muxval = 2, | 314 | .muxval = 2, |
361 | .cctl = 0, | ||
362 | .periph_buses = PL08X_AHB2, | 315 | .periph_buses = PL08X_AHB2, |
363 | }, { | 316 | }, { |
364 | .bus_id = "ext7_tx", | 317 | .bus_id = "ext7_tx", |
365 | .min_signal = 15, | 318 | .min_signal = 15, |
366 | .max_signal = 15, | 319 | .max_signal = 15, |
367 | .muxval = 2, | 320 | .muxval = 2, |
368 | .cctl = 0, | ||
369 | .periph_buses = PL08X_AHB2, | 321 | .periph_buses = PL08X_AHB2, |
370 | }, | 322 | }, |
371 | }; | 323 | }; |
@@ -373,7 +325,8 @@ static struct pl08x_channel_data spear600_dma_info[] = { | |||
373 | struct pl08x_platform_data pl080_plat_data = { | 325 | struct pl08x_platform_data pl080_plat_data = { |
374 | .memcpy_channel = { | 326 | .memcpy_channel = { |
375 | .bus_id = "memcpy", | 327 | .bus_id = "memcpy", |
376 | .cctl = (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \ | 328 | .cctl_memcpy = |
329 | (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \ | ||
377 | PL080_BSIZE_16 << PL080_CONTROL_DB_SIZE_SHIFT | \ | 330 | PL080_BSIZE_16 << PL080_CONTROL_DB_SIZE_SHIFT | \ |
378 | PL080_WIDTH_32BIT << PL080_CONTROL_SWIDTH_SHIFT | \ | 331 | PL080_WIDTH_32BIT << PL080_CONTROL_SWIDTH_SHIFT | \ |
379 | PL080_WIDTH_32BIT << PL080_CONTROL_DWIDTH_SHIFT | \ | 332 | PL080_WIDTH_32BIT << PL080_CONTROL_DWIDTH_SHIFT | \ |