aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/mcbsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap1/mcbsp.c')
-rw-r--r--arch/arm/mach-omap1/mcbsp.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index b0d4723c9a90..8ed67f8d1762 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -27,7 +27,6 @@
27#include <mach/irqs.h> 27#include <mach/irqs.h>
28 28
29#include "iomap.h" 29#include "iomap.h"
30#include "dma.h"
31 30
32#define DPS_RSTCT2_PER_EN (1 << 0) 31#define DPS_RSTCT2_PER_EN (1 << 0)
33#define DSP_RSTCT2_WD_PER_EN (1 << 1) 32#define DSP_RSTCT2_WD_PER_EN (1 << 1)
@@ -114,12 +113,12 @@ struct resource omap7xx_mcbsp_res[][6] = {
114 }, 113 },
115 { 114 {
116 .name = "rx", 115 .name = "rx",
117 .start = OMAP_DMA_MCBSP1_RX, 116 .start = 9,
118 .flags = IORESOURCE_DMA, 117 .flags = IORESOURCE_DMA,
119 }, 118 },
120 { 119 {
121 .name = "tx", 120 .name = "tx",
122 .start = OMAP_DMA_MCBSP1_TX, 121 .start = 8,
123 .flags = IORESOURCE_DMA, 122 .flags = IORESOURCE_DMA,
124 }, 123 },
125 }, 124 },
@@ -141,12 +140,12 @@ struct resource omap7xx_mcbsp_res[][6] = {
141 }, 140 },
142 { 141 {
143 .name = "rx", 142 .name = "rx",
144 .start = OMAP_DMA_MCBSP3_RX, 143 .start = 11,
145 .flags = IORESOURCE_DMA, 144 .flags = IORESOURCE_DMA,
146 }, 145 },
147 { 146 {
148 .name = "tx", 147 .name = "tx",
149 .start = OMAP_DMA_MCBSP3_TX, 148 .start = 10,
150 .flags = IORESOURCE_DMA, 149 .flags = IORESOURCE_DMA,
151 }, 150 },
152 }, 151 },
@@ -191,12 +190,12 @@ struct resource omap15xx_mcbsp_res[][6] = {
191 }, 190 },
192 { 191 {
193 .name = "rx", 192 .name = "rx",
194 .start = OMAP_DMA_MCBSP1_RX, 193 .start = 9,
195 .flags = IORESOURCE_DMA, 194 .flags = IORESOURCE_DMA,
196 }, 195 },
197 { 196 {
198 .name = "tx", 197 .name = "tx",
199 .start = OMAP_DMA_MCBSP1_TX, 198 .start = 8,
200 .flags = IORESOURCE_DMA, 199 .flags = IORESOURCE_DMA,
201 }, 200 },
202 }, 201 },
@@ -218,12 +217,12 @@ struct resource omap15xx_mcbsp_res[][6] = {
218 }, 217 },
219 { 218 {
220 .name = "rx", 219 .name = "rx",
221 .start = OMAP_DMA_MCBSP2_RX, 220 .start = 17,
222 .flags = IORESOURCE_DMA, 221 .flags = IORESOURCE_DMA,
223 }, 222 },
224 { 223 {
225 .name = "tx", 224 .name = "tx",
226 .start = OMAP_DMA_MCBSP2_TX, 225 .start = 16,
227 .flags = IORESOURCE_DMA, 226 .flags = IORESOURCE_DMA,
228 }, 227 },
229 }, 228 },
@@ -245,12 +244,12 @@ struct resource omap15xx_mcbsp_res[][6] = {
245 }, 244 },
246 { 245 {
247 .name = "rx", 246 .name = "rx",
248 .start = OMAP_DMA_MCBSP3_RX, 247 .start = 11,
249 .flags = IORESOURCE_DMA, 248 .flags = IORESOURCE_DMA,
250 }, 249 },
251 { 250 {
252 .name = "tx", 251 .name = "tx",
253 .start = OMAP_DMA_MCBSP3_TX, 252 .start = 10,
254 .flags = IORESOURCE_DMA, 253 .flags = IORESOURCE_DMA,
255 }, 254 },
256 }, 255 },
@@ -298,12 +297,12 @@ struct resource omap16xx_mcbsp_res[][6] = {
298 }, 297 },
299 { 298 {
300 .name = "rx", 299 .name = "rx",
301 .start = OMAP_DMA_MCBSP1_RX, 300 .start = 9,
302 .flags = IORESOURCE_DMA, 301 .flags = IORESOURCE_DMA,
303 }, 302 },
304 { 303 {
305 .name = "tx", 304 .name = "tx",
306 .start = OMAP_DMA_MCBSP1_TX, 305 .start = 8,
307 .flags = IORESOURCE_DMA, 306 .flags = IORESOURCE_DMA,
308 }, 307 },
309 }, 308 },
@@ -325,12 +324,12 @@ struct resource omap16xx_mcbsp_res[][6] = {
325 }, 324 },
326 { 325 {
327 .name = "rx", 326 .name = "rx",
328 .start = OMAP_DMA_MCBSP2_RX, 327 .start = 17,
329 .flags = IORESOURCE_DMA, 328 .flags = IORESOURCE_DMA,
330 }, 329 },
331 { 330 {
332 .name = "tx", 331 .name = "tx",
333 .start = OMAP_DMA_MCBSP2_TX, 332 .start = 16,
334 .flags = IORESOURCE_DMA, 333 .flags = IORESOURCE_DMA,
335 }, 334 },
336 }, 335 },
@@ -352,12 +351,12 @@ struct resource omap16xx_mcbsp_res[][6] = {
352 }, 351 },
353 { 352 {
354 .name = "rx", 353 .name = "rx",
355 .start = OMAP_DMA_MCBSP3_RX, 354 .start = 11,
356 .flags = IORESOURCE_DMA, 355 .flags = IORESOURCE_DMA,
357 }, 356 },
358 { 357 {
359 .name = "tx", 358 .name = "tx",
360 .start = OMAP_DMA_MCBSP3_TX, 359 .start = 10,
361 .flags = IORESOURCE_DMA, 360 .flags = IORESOURCE_DMA,
362 }, 361 },
363 }, 362 },