677ba2b0c583e037c230d716a290b5dfe6c8991b
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / pm-wip / voltdm / 0042-omap_hwmod-share-identical-omap_hwmod_dma_info-array.patch
1 From a4e1221f9e6803ac9a75f396e6c8a07421d15031 Mon Sep 17 00:00:00 2001
2 From: Paul Walmsley <paul@pwsan.com>
3 Date: Sat, 9 Jul 2011 19:14:07 -0600
4 Subject: [PATCH 042/149] omap_hwmod: share identical omap_hwmod_dma_info arrays
6 To reduce kernel source file data duplication, share struct
7 omap_hwmod_dma_info arrays across OMAP2xxx and 3xxx hwmod data files.
9 Signed-off-by: Paul Walmsley <paul@pwsan.com>
10 ---
11 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 87 ++----------------
12 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 95 +++-----------------
13 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 92 +++++++++++++++++++
14 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 6 ++
15 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 89 ++----------------
16 arch/arm/mach-omap2/omap_hwmod_common_data.c | 20 ----
17 arch/arm/mach-omap2/omap_hwmod_common_data.h | 15 +++
18 7 files changed, 144 insertions(+), 260 deletions(-)
20 diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
21 index 60c817e..6acc01f 100644
22 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
23 +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
24 @@ -828,12 +828,6 @@ static struct omap_hwmod_class uart_class = {
26 /* UART1 */
28 -static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
29 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
30 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
31 - { .dma_req = -1 }
32 -};
33 -
34 static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
35 &omap2_l4_core__uart1,
36 };
37 @@ -841,7 +835,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
38 static struct omap_hwmod omap2420_uart1_hwmod = {
39 .name = "uart1",
40 .mpu_irqs = omap2_uart1_mpu_irqs,
41 - .sdma_reqs = uart1_sdma_reqs,
42 + .sdma_reqs = omap2_uart1_sdma_reqs,
43 .main_clk = "uart1_fck",
44 .prcm = {
45 .omap2 = {
46 @@ -860,12 +854,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = {
48 /* UART2 */
50 -static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
51 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
52 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
53 - { .dma_req = -1 }
54 -};
55 -
56 static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
57 &omap2_l4_core__uart2,
58 };
59 @@ -873,7 +861,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
60 static struct omap_hwmod omap2420_uart2_hwmod = {
61 .name = "uart2",
62 .mpu_irqs = omap2_uart2_mpu_irqs,
63 - .sdma_reqs = uart2_sdma_reqs,
64 + .sdma_reqs = omap2_uart2_sdma_reqs,
65 .main_clk = "uart2_fck",
66 .prcm = {
67 .omap2 = {
68 @@ -892,12 +880,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = {
70 /* UART3 */
72 -static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
73 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
74 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
75 - { .dma_req = -1 }
76 -};
77 -
78 static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
79 &omap2_l4_core__uart3,
80 };
81 @@ -905,7 +887,7 @@ static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
82 static struct omap_hwmod omap2420_uart3_hwmod = {
83 .name = "uart3",
84 .mpu_irqs = omap2_uart3_mpu_irqs,
85 - .sdma_reqs = uart3_sdma_reqs,
86 + .sdma_reqs = omap2_uart3_sdma_reqs,
87 .main_clk = "uart3_fck",
88 .prcm = {
89 .omap2 = {
90 @@ -940,11 +922,6 @@ static struct omap_hwmod_class omap2420_dss_hwmod_class = {
91 .sysc = &omap2420_dss_sysc,
92 };
94 -static struct omap_hwmod_dma_info omap2420_dss_sdma_chs[] = {
95 - { .name = "dispc", .dma_req = 5 },
96 - { .dma_req = -1 }
97 -};
98 -
99 /* dss */
100 /* dss master ports */
101 static struct omap_hwmod_ocp_if *omap2420_dss_masters[] = {
102 @@ -980,7 +957,7 @@ static struct omap_hwmod omap2420_dss_core_hwmod = {
103 .name = "dss_core",
104 .class = &omap2420_dss_hwmod_class,
105 .main_clk = "dss1_fck", /* instead of dss_fck */
106 - .sdma_reqs = omap2420_dss_sdma_chs,
107 + .sdma_reqs = omap2xxx_dss_sdma_chs,
108 .prcm = {
109 .omap2 = {
110 .prcm_reg_id = 1,
111 @@ -1183,12 +1160,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr;
113 /* I2C1 */
115 -static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
116 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
117 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
118 - { .dma_req = -1 }
119 -};
120 -
121 static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
122 &omap2420_l4_core__i2c1,
123 };
124 @@ -1196,7 +1167,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
125 static struct omap_hwmod omap2420_i2c1_hwmod = {
126 .name = "i2c1",
127 .mpu_irqs = omap2_i2c1_mpu_irqs,
128 - .sdma_reqs = i2c1_sdma_reqs,
129 + .sdma_reqs = omap2_i2c1_sdma_reqs,
130 .main_clk = "i2c1_fck",
131 .prcm = {
132 .omap2 = {
133 @@ -1217,12 +1188,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = {
135 /* I2C2 */
137 -static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
138 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
139 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
140 - { .dma_req = -1 }
141 -};
142 -
143 static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
144 &omap2420_l4_core__i2c2,
145 };
146 @@ -1230,7 +1195,7 @@ static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
147 static struct omap_hwmod omap2420_i2c2_hwmod = {
148 .name = "i2c2",
149 .mpu_irqs = omap2_i2c2_mpu_irqs,
150 - .sdma_reqs = i2c2_sdma_reqs,
151 + .sdma_reqs = omap2_i2c2_sdma_reqs,
152 .main_clk = "i2c2_fck",
153 .prcm = {
154 .omap2 = {
155 @@ -1602,18 +1567,6 @@ static struct omap_hwmod_class omap2420_mcspi_class = {
156 };
158 /* mcspi1 */
159 -static struct omap_hwmod_dma_info omap2420_mcspi1_sdma_reqs[] = {
160 - { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */
161 - { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */
162 - { .name = "tx1", .dma_req = 37 }, /* DMA_SPI1_TX1 */
163 - { .name = "rx1", .dma_req = 38 }, /* DMA_SPI1_RX1 */
164 - { .name = "tx2", .dma_req = 39 }, /* DMA_SPI1_TX2 */
165 - { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */
166 - { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */
167 - { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */
168 - { .dma_req = -1 }
169 -};
170 -
171 static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = {
172 &omap2420_l4_core__mcspi1,
173 };
174 @@ -1625,7 +1578,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
175 static struct omap_hwmod omap2420_mcspi1_hwmod = {
176 .name = "mcspi1_hwmod",
177 .mpu_irqs = omap2_mcspi1_mpu_irqs,
178 - .sdma_reqs = omap2420_mcspi1_sdma_reqs,
179 + .sdma_reqs = omap2_mcspi1_sdma_reqs,
180 .main_clk = "mcspi1_fck",
181 .prcm = {
182 .omap2 = {
183 @@ -1644,14 +1597,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = {
184 };
186 /* mcspi2 */
187 -static struct omap_hwmod_dma_info omap2420_mcspi2_sdma_reqs[] = {
188 - { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */
189 - { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
190 - { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */
191 - { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */
192 - { .dma_req = -1 }
193 -};
194 -
195 static struct omap_hwmod_ocp_if *omap2420_mcspi2_slaves[] = {
196 &omap2420_l4_core__mcspi2,
197 };
198 @@ -1663,7 +1608,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
199 static struct omap_hwmod omap2420_mcspi2_hwmod = {
200 .name = "mcspi2_hwmod",
201 .mpu_irqs = omap2_mcspi2_mpu_irqs,
202 - .sdma_reqs = omap2420_mcspi2_sdma_reqs,
203 + .sdma_reqs = omap2_mcspi2_sdma_reqs,
204 .main_clk = "mcspi2_fck",
205 .prcm = {
206 .omap2 = {
207 @@ -1697,12 +1642,6 @@ static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = {
208 { .irq = -1 }
209 };
211 -static struct omap_hwmod_dma_info omap2420_mcbsp1_sdma_chs[] = {
212 - { .name = "rx", .dma_req = 32 },
213 - { .name = "tx", .dma_req = 31 },
214 - { .dma_req = -1 }
215 -};
216 -
217 /* l4_core -> mcbsp1 */
218 static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp1 = {
219 .master = &omap2420_l4_core_hwmod,
220 @@ -1721,7 +1660,7 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = {
221 .name = "mcbsp1",
222 .class = &omap2420_mcbsp_hwmod_class,
223 .mpu_irqs = omap2420_mcbsp1_irqs,
224 - .sdma_reqs = omap2420_mcbsp1_sdma_chs,
225 + .sdma_reqs = omap2_mcbsp1_sdma_reqs,
226 .main_clk = "mcbsp1_fck",
227 .prcm = {
228 .omap2 = {
229 @@ -1744,12 +1683,6 @@ static struct omap_hwmod_irq_info omap2420_mcbsp2_irqs[] = {
230 { .irq = -1 }
231 };
233 -static struct omap_hwmod_dma_info omap2420_mcbsp2_sdma_chs[] = {
234 - { .name = "rx", .dma_req = 34 },
235 - { .name = "tx", .dma_req = 33 },
236 - { .dma_req = -1 }
237 -};
238 -
239 /* l4_core -> mcbsp2 */
240 static struct omap_hwmod_ocp_if omap2420_l4_core__mcbsp2 = {
241 .master = &omap2420_l4_core_hwmod,
242 @@ -1768,7 +1701,7 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = {
243 .name = "mcbsp2",
244 .class = &omap2420_mcbsp_hwmod_class,
245 .mpu_irqs = omap2420_mcbsp2_irqs,
246 - .sdma_reqs = omap2420_mcbsp2_sdma_chs,
247 + .sdma_reqs = omap2_mcbsp2_sdma_reqs,
248 .main_clk = "mcbsp2_fck",
249 .prcm = {
250 .omap2 = {
251 diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
252 index af758b3..639acd5 100644
253 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
254 +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
255 @@ -900,12 +900,6 @@ static struct omap_hwmod_class uart_class = {
257 /* UART1 */
259 -static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
260 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
261 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
262 - { .dma_req = -1 }
263 -};
264 -
265 static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
266 &omap2_l4_core__uart1,
267 };
268 @@ -913,7 +907,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
269 static struct omap_hwmod omap2430_uart1_hwmod = {
270 .name = "uart1",
271 .mpu_irqs = omap2_uart1_mpu_irqs,
272 - .sdma_reqs = uart1_sdma_reqs,
273 + .sdma_reqs = omap2_uart1_sdma_reqs,
274 .main_clk = "uart1_fck",
275 .prcm = {
276 .omap2 = {
277 @@ -932,12 +926,6 @@ static struct omap_hwmod omap2430_uart1_hwmod = {
279 /* UART2 */
281 -static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
282 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
283 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
284 - { .dma_req = -1 }
285 -};
286 -
287 static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
288 &omap2_l4_core__uart2,
289 };
290 @@ -945,7 +933,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
291 static struct omap_hwmod omap2430_uart2_hwmod = {
292 .name = "uart2",
293 .mpu_irqs = omap2_uart2_mpu_irqs,
294 - .sdma_reqs = uart2_sdma_reqs,
295 + .sdma_reqs = omap2_uart2_sdma_reqs,
296 .main_clk = "uart2_fck",
297 .prcm = {
298 .omap2 = {
299 @@ -964,12 +952,6 @@ static struct omap_hwmod omap2430_uart2_hwmod = {
301 /* UART3 */
303 -static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
304 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
305 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
306 - { .dma_req = -1 }
307 -};
308 -
309 static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
310 &omap2_l4_core__uart3,
311 };
312 @@ -977,7 +959,7 @@ static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
313 static struct omap_hwmod omap2430_uart3_hwmod = {
314 .name = "uart3",
315 .mpu_irqs = omap2_uart3_mpu_irqs,
316 - .sdma_reqs = uart3_sdma_reqs,
317 + .sdma_reqs = omap2_uart3_sdma_reqs,
318 .main_clk = "uart3_fck",
319 .prcm = {
320 .omap2 = {
321 @@ -1012,11 +994,6 @@ static struct omap_hwmod_class omap2430_dss_hwmod_class = {
322 .sysc = &omap2430_dss_sysc,
323 };
325 -static struct omap_hwmod_dma_info omap2430_dss_sdma_chs[] = {
326 - { .name = "dispc", .dma_req = 5 },
327 - { .dma_req = -1 }
328 -};
329 -
330 /* dss */
331 /* dss master ports */
332 static struct omap_hwmod_ocp_if *omap2430_dss_masters[] = {
333 @@ -1046,7 +1023,7 @@ static struct omap_hwmod omap2430_dss_core_hwmod = {
334 .name = "dss_core",
335 .class = &omap2430_dss_hwmod_class,
336 .main_clk = "dss1_fck", /* instead of dss_fck */
337 - .sdma_reqs = omap2430_dss_sdma_chs,
338 + .sdma_reqs = omap2xxx_dss_sdma_chs,
339 .prcm = {
340 .omap2 = {
341 .prcm_reg_id = 1,
342 @@ -1234,12 +1211,6 @@ static struct omap_i2c_dev_attr i2c_dev_attr = {
344 /* I2C1 */
346 -static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
347 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
348 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
349 - { .dma_req = -1 }
350 -};
351 -
352 static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
353 &omap2430_l4_core__i2c1,
354 };
355 @@ -1247,7 +1218,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
356 static struct omap_hwmod omap2430_i2c1_hwmod = {
357 .name = "i2c1",
358 .mpu_irqs = omap2_i2c1_mpu_irqs,
359 - .sdma_reqs = i2c1_sdma_reqs,
360 + .sdma_reqs = omap2_i2c1_sdma_reqs,
361 .main_clk = "i2chs1_fck",
362 .prcm = {
363 .omap2 = {
364 @@ -1275,12 +1246,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {
366 /* I2C2 */
368 -static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
369 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
370 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
371 - { .dma_req = -1 }
372 -};
373 -
374 static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
375 &omap2430_l4_core__i2c2,
376 };
377 @@ -1288,7 +1253,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
378 static struct omap_hwmod omap2430_i2c2_hwmod = {
379 .name = "i2c2",
380 .mpu_irqs = omap2_i2c2_mpu_irqs,
381 - .sdma_reqs = i2c2_sdma_reqs,
382 + .sdma_reqs = omap2_i2c2_sdma_reqs,
383 .main_clk = "i2chs2_fck",
384 .prcm = {
385 .omap2 = {
386 @@ -1707,18 +1672,6 @@ static struct omap_hwmod_class omap2430_mcspi_class = {
387 };
389 /* mcspi1 */
390 -static struct omap_hwmod_dma_info omap2430_mcspi1_sdma_reqs[] = {
391 - { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */
392 - { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */
393 - { .name = "tx1", .dma_req = 37 }, /* DMA_SPI1_TX1 */
394 - { .name = "rx1", .dma_req = 38 }, /* DMA_SPI1_RX1 */
395 - { .name = "tx2", .dma_req = 39 }, /* DMA_SPI1_TX2 */
396 - { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */
397 - { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */
398 - { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */
399 - { .dma_req = -1 }
400 -};
401 -
402 static struct omap_hwmod_ocp_if *omap2430_mcspi1_slaves[] = {
403 &omap2430_l4_core__mcspi1,
404 };
405 @@ -1730,7 +1683,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
406 static struct omap_hwmod omap2430_mcspi1_hwmod = {
407 .name = "mcspi1_hwmod",
408 .mpu_irqs = omap2_mcspi1_mpu_irqs,
409 - .sdma_reqs = omap2430_mcspi1_sdma_reqs,
410 + .sdma_reqs = omap2_mcspi1_sdma_reqs,
411 .main_clk = "mcspi1_fck",
412 .prcm = {
413 .omap2 = {
414 @@ -1749,14 +1702,6 @@ static struct omap_hwmod omap2430_mcspi1_hwmod = {
415 };
417 /* mcspi2 */
418 -static struct omap_hwmod_dma_info omap2430_mcspi2_sdma_reqs[] = {
419 - { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */
420 - { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
421 - { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */
422 - { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */
423 - { .dma_req = -1 }
424 -};
425 -
426 static struct omap_hwmod_ocp_if *omap2430_mcspi2_slaves[] = {
427 &omap2430_l4_core__mcspi2,
428 };
429 @@ -1768,7 +1713,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
430 static struct omap_hwmod omap2430_mcspi2_hwmod = {
431 .name = "mcspi2_hwmod",
432 .mpu_irqs = omap2_mcspi2_mpu_irqs,
433 - .sdma_reqs = omap2430_mcspi2_sdma_reqs,
434 + .sdma_reqs = omap2_mcspi2_sdma_reqs,
435 .main_clk = "mcspi2_fck",
436 .prcm = {
437 .omap2 = {
438 @@ -1912,12 +1857,6 @@ static struct omap_hwmod_irq_info omap2430_mcbsp1_irqs[] = {
439 { .irq = -1 }
440 };
442 -static struct omap_hwmod_dma_info omap2430_mcbsp1_sdma_chs[] = {
443 - { .name = "rx", .dma_req = 32 },
444 - { .name = "tx", .dma_req = 31 },
445 - { .dma_req = -1 }
446 -};
447 -
448 /* l4_core -> mcbsp1 */
449 static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp1 = {
450 .master = &omap2430_l4_core_hwmod,
451 @@ -1936,7 +1875,7 @@ static struct omap_hwmod omap2430_mcbsp1_hwmod = {
452 .name = "mcbsp1",
453 .class = &omap2430_mcbsp_hwmod_class,
454 .mpu_irqs = omap2430_mcbsp1_irqs,
455 - .sdma_reqs = omap2430_mcbsp1_sdma_chs,
456 + .sdma_reqs = omap2_mcbsp1_sdma_reqs,
457 .main_clk = "mcbsp1_fck",
458 .prcm = {
459 .omap2 = {
460 @@ -1960,12 +1899,6 @@ static struct omap_hwmod_irq_info omap2430_mcbsp2_irqs[] = {
461 { .irq = -1 }
462 };
464 -static struct omap_hwmod_dma_info omap2430_mcbsp2_sdma_chs[] = {
465 - { .name = "rx", .dma_req = 34 },
466 - { .name = "tx", .dma_req = 33 },
467 - { .dma_req = -1 }
468 -};
469 -
470 /* l4_core -> mcbsp2 */
471 static struct omap_hwmod_ocp_if omap2430_l4_core__mcbsp2 = {
472 .master = &omap2430_l4_core_hwmod,
473 @@ -1984,7 +1917,7 @@ static struct omap_hwmod omap2430_mcbsp2_hwmod = {
474 .name = "mcbsp2",
475 .class = &omap2430_mcbsp_hwmod_class,
476 .mpu_irqs = omap2430_mcbsp2_irqs,
477 - .sdma_reqs = omap2430_mcbsp2_sdma_chs,
478 + .sdma_reqs = omap2_mcbsp2_sdma_reqs,
479 .main_clk = "mcbsp2_fck",
480 .prcm = {
481 .omap2 = {
482 @@ -2008,12 +1941,6 @@ static struct omap_hwmod_irq_info omap2430_mcbsp3_irqs[] = {
483 { .irq = -1 }
484 };
486 -static struct omap_hwmod_dma_info omap2430_mcbsp3_sdma_chs[] = {
487 - { .name = "rx", .dma_req = 18 },
488 - { .name = "tx", .dma_req = 17 },
489 - { .dma_req = -1 }
490 -};
491 -
492 static struct omap_hwmod_addr_space omap2430_mcbsp3_addrs[] = {
493 {
494 .name = "mpu",
495 @@ -2042,7 +1969,7 @@ static struct omap_hwmod omap2430_mcbsp3_hwmod = {
496 .name = "mcbsp3",
497 .class = &omap2430_mcbsp_hwmod_class,
498 .mpu_irqs = omap2430_mcbsp3_irqs,
499 - .sdma_reqs = omap2430_mcbsp3_sdma_chs,
500 + .sdma_reqs = omap2_mcbsp3_sdma_reqs,
501 .main_clk = "mcbsp3_fck",
502 .prcm = {
503 .omap2 = {
504 diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
505 index 245294b..7c4f5ab 100644
506 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
507 +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
508 @@ -10,11 +10,35 @@
509 */
510 #include <plat/omap_hwmod.h>
511 #include <plat/serial.h>
512 +#include <plat/dma.h>
514 #include <mach/irqs.h>
516 #include "omap_hwmod_common_data.h"
518 +
519 +/*
520 + * omap_hwmod class data
521 + */
522 +
523 +struct omap_hwmod_class l3_hwmod_class = {
524 + .name = "l3"
525 +};
526 +
527 +struct omap_hwmod_class l4_hwmod_class = {
528 + .name = "l4"
529 +};
530 +
531 +struct omap_hwmod_class mpu_hwmod_class = {
532 + .name = "mpu"
533 +};
534 +
535 +struct omap_hwmod_class iva_hwmod_class = {
536 + .name = "iva"
537 +};
538 +
539 +/* Common MPU IRQ line data */
540 +
541 struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[] = {
542 { .irq = 37, },
543 { .irq = -1 }
544 @@ -138,5 +162,73 @@ struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[] = {
545 { .irq = -1 }
546 };
548 +/* Common DMA request line data */
549 +struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[] = {
550 + { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
551 + { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
552 + { .dma_req = -1 }
553 +};
554 +
555 +struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[] = {
556 + { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
557 + { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
558 + { .dma_req = -1 }
559 +};
560 +
561 +struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[] = {
562 + { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
563 + { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
564 + { .dma_req = -1 }
565 +};
566 +
567 +struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[] = {
568 + { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
569 + { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
570 + { .dma_req = -1 }
571 +};
572 +
573 +struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[] = {
574 + { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
575 + { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
576 + { .dma_req = -1 }
577 +};
578 +
579 +struct omap_hwmod_dma_info omap2_mcspi1_sdma_reqs[] = {
580 + { .name = "tx0", .dma_req = 35 }, /* DMA_SPI1_TX0 */
581 + { .name = "rx0", .dma_req = 36 }, /* DMA_SPI1_RX0 */
582 + { .name = "tx1", .dma_req = 37 }, /* DMA_SPI1_TX1 */
583 + { .name = "rx1", .dma_req = 38 }, /* DMA_SPI1_RX1 */
584 + { .name = "tx2", .dma_req = 39 }, /* DMA_SPI1_TX2 */
585 + { .name = "rx2", .dma_req = 40 }, /* DMA_SPI1_RX2 */
586 + { .name = "tx3", .dma_req = 41 }, /* DMA_SPI1_TX3 */
587 + { .name = "rx3", .dma_req = 42 }, /* DMA_SPI1_RX3 */
588 + { .dma_req = -1 }
589 +};
590 +
591 +struct omap_hwmod_dma_info omap2_mcspi2_sdma_reqs[] = {
592 + { .name = "tx0", .dma_req = 43 }, /* DMA_SPI2_TX0 */
593 + { .name = "rx0", .dma_req = 44 }, /* DMA_SPI2_RX0 */
594 + { .name = "tx1", .dma_req = 45 }, /* DMA_SPI2_TX1 */
595 + { .name = "rx1", .dma_req = 46 }, /* DMA_SPI2_RX1 */
596 + { .dma_req = -1 }
597 +};
598 +
599 +struct omap_hwmod_dma_info omap2_mcbsp1_sdma_reqs[] = {
600 + { .name = "rx", .dma_req = 32 },
601 + { .name = "tx", .dma_req = 31 },
602 + { .dma_req = -1 }
603 +};
604 +
605 +struct omap_hwmod_dma_info omap2_mcbsp2_sdma_reqs[] = {
606 + { .name = "rx", .dma_req = 34 },
607 + { .name = "tx", .dma_req = 33 },
608 + { .dma_req = -1 }
609 +};
610 +
611 +struct omap_hwmod_dma_info omap2_mcbsp3_sdma_reqs[] = {
612 + { .name = "rx", .dma_req = 18 },
613 + { .name = "tx", .dma_req = 17 },
614 + { .dma_req = -1 }
615 +};
618 diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
619 index 5a078a6..f5b63ef 100644
620 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
621 +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
622 @@ -10,6 +10,7 @@
623 */
624 #include <plat/omap_hwmod.h>
625 #include <plat/serial.h>
626 +#include <plat/dma.h>
628 #include <mach/irqs.h>
630 @@ -19,3 +20,8 @@ struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[] = {
631 { .irq = 48, },
632 { .irq = -1 }
633 };
634 +
635 +struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[] = {
636 + { .name = "dispc", .dma_req = 5 },
637 + { .dma_req = -1 }
638 +};
639 diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
640 index 265f0b1..001f67b 100644
641 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
642 +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
643 @@ -1210,12 +1210,6 @@ static struct omap_hwmod_class uart_class = {
645 /* UART1 */
647 -static struct omap_hwmod_dma_info uart1_sdma_reqs[] = {
648 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART1_TX, },
649 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART1_RX, },
650 - { .dma_req = -1 }
651 -};
652 -
653 static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
654 &omap3_l4_core__uart1,
655 };
656 @@ -1223,7 +1217,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
657 static struct omap_hwmod omap3xxx_uart1_hwmod = {
658 .name = "uart1",
659 .mpu_irqs = omap2_uart1_mpu_irqs,
660 - .sdma_reqs = uart1_sdma_reqs,
661 + .sdma_reqs = omap2_uart1_sdma_reqs,
662 .main_clk = "uart1_fck",
663 .prcm = {
664 .omap2 = {
665 @@ -1242,12 +1236,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {
667 /* UART2 */
669 -static struct omap_hwmod_dma_info uart2_sdma_reqs[] = {
670 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART2_TX, },
671 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART2_RX, },
672 - { .dma_req = -1 }
673 -};
674 -
675 static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
676 &omap3_l4_core__uart2,
677 };
678 @@ -1255,7 +1243,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
679 static struct omap_hwmod omap3xxx_uart2_hwmod = {
680 .name = "uart2",
681 .mpu_irqs = omap2_uart2_mpu_irqs,
682 - .sdma_reqs = uart2_sdma_reqs,
683 + .sdma_reqs = omap2_uart2_sdma_reqs,
684 .main_clk = "uart2_fck",
685 .prcm = {
686 .omap2 = {
687 @@ -1274,12 +1262,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {
689 /* UART3 */
691 -static struct omap_hwmod_dma_info uart3_sdma_reqs[] = {
692 - { .name = "tx", .dma_req = OMAP24XX_DMA_UART3_TX, },
693 - { .name = "rx", .dma_req = OMAP24XX_DMA_UART3_RX, },
694 - { .dma_req = -1 }
695 -};
696 -
697 static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
698 &omap3_l4_per__uart3,
699 };
700 @@ -1287,7 +1269,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
701 static struct omap_hwmod omap3xxx_uart3_hwmod = {
702 .name = "uart3",
703 .mpu_irqs = omap2_uart3_mpu_irqs,
704 - .sdma_reqs = uart3_sdma_reqs,
705 + .sdma_reqs = omap2_uart3_sdma_reqs,
706 .main_clk = "uart3_fck",
707 .prcm = {
708 .omap2 = {
709 @@ -1714,12 +1696,6 @@ static struct omap_i2c_dev_attr i2c1_dev_attr = {
710 .fifo_depth = 8, /* bytes */
711 };
713 -static struct omap_hwmod_dma_info i2c1_sdma_reqs[] = {
714 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C1_TX },
715 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C1_RX },
716 - { .dma_req = -1 }
717 -};
718 -
719 static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {
720 &omap3_l4_core__i2c1,
721 };
722 @@ -1727,7 +1703,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {
723 static struct omap_hwmod omap3xxx_i2c1_hwmod = {
724 .name = "i2c1",
725 .mpu_irqs = omap2_i2c1_mpu_irqs,
726 - .sdma_reqs = i2c1_sdma_reqs,
727 + .sdma_reqs = omap2_i2c1_sdma_reqs,
728 .main_clk = "i2c1_fck",
729 .prcm = {
730 .omap2 = {
731 @@ -1751,12 +1727,6 @@ static struct omap_i2c_dev_attr i2c2_dev_attr = {
732 .fifo_depth = 8, /* bytes */
733 };
735 -static struct omap_hwmod_dma_info i2c2_sdma_reqs[] = {
736 - { .name = "tx", .dma_req = OMAP24XX_DMA_I2C2_TX },
737 - { .name = "rx", .dma_req = OMAP24XX_DMA_I2C2_RX },
738 - { .dma_req = -1 }
739 -};
740 -
741 static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {
742 &omap3_l4_core__i2c2,
743 };
744 @@ -1764,7 +1734,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {
745 static struct omap_hwmod omap3xxx_i2c2_hwmod = {
746 .name = "i2c2",
747 .mpu_irqs = omap2_i2c2_mpu_irqs,
748 - .sdma_reqs = i2c2_sdma_reqs,
749 + .sdma_reqs = omap2_i2c2_sdma_reqs,
750 .main_clk = "i2c2_fck",
751 .prcm = {
752 .omap2 = {
753 @@ -2269,12 +2239,6 @@ static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {
754 { .irq = -1 }
755 };
757 -static struct omap_hwmod_dma_info omap3xxx_mcbsp1_sdma_chs[] = {
758 - { .name = "rx", .dma_req = 32 },
759 - { .name = "tx", .dma_req = 31 },
760 - { .dma_req = -1 }
761 -};
762 -
763 static struct omap_hwmod_addr_space omap3xxx_mcbsp1_addrs[] = {
764 {
765 .name = "mpu",
766 @@ -2303,7 +2267,7 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
767 .name = "mcbsp1",
768 .class = &omap3xxx_mcbsp_hwmod_class,
769 .mpu_irqs = omap3xxx_mcbsp1_irqs,
770 - .sdma_reqs = omap3xxx_mcbsp1_sdma_chs,
771 + .sdma_reqs = omap2_mcbsp1_sdma_reqs,
772 .main_clk = "mcbsp1_fck",
773 .prcm = {
774 .omap2 = {
775 @@ -2327,12 +2291,6 @@ static struct omap_hwmod_irq_info omap3xxx_mcbsp2_irqs[] = {
776 { .irq = -1 }
777 };
779 -static struct omap_hwmod_dma_info omap3xxx_mcbsp2_sdma_chs[] = {
780 - { .name = "rx", .dma_req = 34 },
781 - { .name = "tx", .dma_req = 33 },
782 - { .dma_req = -1 }
783 -};
784 -
785 static struct omap_hwmod_addr_space omap3xxx_mcbsp2_addrs[] = {
786 {
787 .name = "mpu",
788 @@ -2349,7 +2307,6 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_per__mcbsp2 = {
789 .slave = &omap3xxx_mcbsp2_hwmod,
790 .clk = "mcbsp2_ick",
791 .addr = omap3xxx_mcbsp2_addrs,
792 -
793 .user = OCP_USER_MPU | OCP_USER_SDMA,
794 };
796 @@ -2366,7 +2323,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
797 .name = "mcbsp2",
798 .class = &omap3xxx_mcbsp_hwmod_class,
799 .mpu_irqs = omap3xxx_mcbsp2_irqs,
800 - .sdma_reqs = omap3xxx_mcbsp2_sdma_chs,
801 + .sdma_reqs = omap2_mcbsp2_sdma_reqs,
802 .main_clk = "mcbsp2_fck",
803 .prcm = {
804 .omap2 = {
805 @@ -2391,12 +2348,6 @@ static struct omap_hwmod_irq_info omap3xxx_mcbsp3_irqs[] = {
806 { .irq = -1 }
807 };
809 -static struct omap_hwmod_dma_info omap3xxx_mcbsp3_sdma_chs[] = {
810 - { .name = "rx", .dma_req = 18 },
811 - { .name = "tx", .dma_req = 17 },
812 - { .dma_req = -1 }
813 -};
814 -
815 static struct omap_hwmod_addr_space omap3xxx_mcbsp3_addrs[] = {
816 {
817 .name = "mpu",
818 @@ -2429,7 +2380,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
819 .name = "mcbsp3",
820 .class = &omap3xxx_mcbsp_hwmod_class,
821 .mpu_irqs = omap3xxx_mcbsp3_irqs,
822 - .sdma_reqs = omap3xxx_mcbsp3_sdma_chs,
823 + .sdma_reqs = omap2_mcbsp3_sdma_reqs,
824 .main_clk = "mcbsp3_fck",
825 .prcm = {
826 .omap2 = {
827 @@ -2939,18 +2890,6 @@ static struct omap_hwmod_class omap34xx_mcspi_class = {
828 };
830 /* mcspi1 */
831 -static struct omap_hwmod_dma_info omap34xx_mcspi1_sdma_reqs[] = {
832 - { .name = "tx0", .dma_req = 35 },
833 - { .name = "rx0", .dma_req = 36 },
834 - { .name = "tx1", .dma_req = 37 },
835 - { .name = "rx1", .dma_req = 38 },
836 - { .name = "tx2", .dma_req = 39 },
837 - { .name = "rx2", .dma_req = 40 },
838 - { .name = "tx3", .dma_req = 41 },
839 - { .name = "rx3", .dma_req = 42 },
840 - { .dma_req = -1 }
841 -};
842 -
843 static struct omap_hwmod_ocp_if *omap34xx_mcspi1_slaves[] = {
844 &omap34xx_l4_core__mcspi1,
845 };
846 @@ -2962,7 +2901,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
847 static struct omap_hwmod omap34xx_mcspi1 = {
848 .name = "mcspi1",
849 .mpu_irqs = omap2_mcspi1_mpu_irqs,
850 - .sdma_reqs = omap34xx_mcspi1_sdma_reqs,
851 + .sdma_reqs = omap2_mcspi1_sdma_reqs,
852 .main_clk = "mcspi1_fck",
853 .prcm = {
854 .omap2 = {
855 @@ -2981,14 +2920,6 @@ static struct omap_hwmod omap34xx_mcspi1 = {
856 };
858 /* mcspi2 */
859 -static struct omap_hwmod_dma_info omap34xx_mcspi2_sdma_reqs[] = {
860 - { .name = "tx0", .dma_req = 43 },
861 - { .name = "rx0", .dma_req = 44 },
862 - { .name = "tx1", .dma_req = 45 },
863 - { .name = "rx1", .dma_req = 46 },
864 - { .dma_req = -1 }
865 -};
866 -
867 static struct omap_hwmod_ocp_if *omap34xx_mcspi2_slaves[] = {
868 &omap34xx_l4_core__mcspi2,
869 };
870 @@ -3000,7 +2931,7 @@ static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
871 static struct omap_hwmod omap34xx_mcspi2 = {
872 .name = "mcspi2",
873 .mpu_irqs = omap2_mcspi2_mpu_irqs,
874 - .sdma_reqs = omap34xx_mcspi2_sdma_reqs,
875 + .sdma_reqs = omap2_mcspi2_sdma_reqs,
876 .main_clk = "mcspi2_fck",
877 .prcm = {
878 .omap2 = {
879 diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.c b/arch/arm/mach-omap2/omap_hwmod_common_data.c
880 index 08a1342..de832eb 100644
881 --- a/arch/arm/mach-omap2/omap_hwmod_common_data.c
882 +++ b/arch/arm/mach-omap2/omap_hwmod_common_data.c
883 @@ -49,23 +49,3 @@ struct omap_hwmod_sysc_fields omap_hwmod_sysc_type2 = {
884 .srst_shift = SYSC_TYPE2_SOFTRESET_SHIFT,
885 };
887 -
888 -/*
889 - * omap_hwmod class data
890 - */
891 -
892 -struct omap_hwmod_class l3_hwmod_class = {
893 - .name = "l3"
894 -};
895 -
896 -struct omap_hwmod_class l4_hwmod_class = {
897 - .name = "l4"
898 -};
899 -
900 -struct omap_hwmod_class mpu_hwmod_class = {
901 - .name = "mpu"
902 -};
903 -
904 -struct omap_hwmod_class iva_hwmod_class = {
905 - .name = "iva"
906 -};
907 diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h
908 index 1ac878c..b636cf6 100644
909 --- a/arch/arm/mach-omap2/omap_hwmod_common_data.h
910 +++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h
911 @@ -51,6 +51,21 @@ extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];
913 /* Common IP block data across OMAP2xxx */
914 extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[];
915 +extern struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[];
916 +
917 +/* Common IP block data */
918 +extern struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[];
919 +extern struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[];
920 +extern struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[];
921 +extern struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[];
922 +extern struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[];
923 +extern struct omap_hwmod_dma_info omap2_mcspi1_sdma_reqs[];
924 +extern struct omap_hwmod_dma_info omap2_mcspi2_sdma_reqs[];
925 +extern struct omap_hwmod_dma_info omap2_mcbsp1_sdma_reqs[];
926 +extern struct omap_hwmod_dma_info omap2_mcbsp2_sdma_reqs[];
927 +
928 +/* Common IP block data on OMAP2430/OMAP3 */
929 +extern struct omap_hwmod_dma_info omap2_mcbsp3_sdma_reqs[];
931 /* Common IP block data across OMAP2/3 */
932 extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[];
933 --
934 1.6.6.1