Skip to content

Commit 6afba9e

Browse files
shimodaypmundt
authored andcommitted
sh: fix the value of sh_dmae_slave_config in setup-sh7757
Fix the value of chcr for SCIF[2-4]_RX and RIIC[0-9]_RX and the value of mid_rid for some RIIC. Signed-off-by: Yoshihiro Shimoda <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
1 parent b00c2c7 commit 6afba9e

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

arch/sh/kernel/cpu/sh4a/setup-sh7757.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = {
183183
{
184184
.slave_id = SHDMA_SLAVE_SCIF2_RX,
185185
.addr = 0x1f4b0014,
186-
.chcr = SM_INC | 0x800 | 0x40000000 |
186+
.chcr = DM_INC | 0x800 | 0x40000000 |
187187
TS_INDEX2VAL(XMIT_SZ_8BIT),
188188
.mid_rid = 0x22,
189189
},
@@ -197,7 +197,7 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = {
197197
{
198198
.slave_id = SHDMA_SLAVE_SCIF3_RX,
199199
.addr = 0x1f4c0014,
200-
.chcr = SM_INC | 0x800 | 0x40000000 |
200+
.chcr = DM_INC | 0x800 | 0x40000000 |
201201
TS_INDEX2VAL(XMIT_SZ_8BIT),
202202
.mid_rid = 0x2a,
203203
},
@@ -211,7 +211,7 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = {
211211
{
212212
.slave_id = SHDMA_SLAVE_SCIF4_RX,
213213
.addr = 0x1f4d0014,
214-
.chcr = SM_INC | 0x800 | 0x40000000 |
214+
.chcr = DM_INC | 0x800 | 0x40000000 |
215215
TS_INDEX2VAL(XMIT_SZ_8BIT),
216216
.mid_rid = 0x42,
217217
},
@@ -228,7 +228,7 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
228228
{
229229
.slave_id = SHDMA_SLAVE_RIIC0_RX,
230230
.addr = 0x1e500013,
231-
.chcr = SM_INC | 0x800 | 0x40000000 |
231+
.chcr = DM_INC | 0x800 | 0x40000000 |
232232
TS_INDEX2VAL(XMIT_SZ_8BIT),
233233
.mid_rid = 0x22,
234234
},
@@ -242,7 +242,7 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
242242
{
243243
.slave_id = SHDMA_SLAVE_RIIC1_RX,
244244
.addr = 0x1e510013,
245-
.chcr = SM_INC | 0x800 | 0x40000000 |
245+
.chcr = DM_INC | 0x800 | 0x40000000 |
246246
TS_INDEX2VAL(XMIT_SZ_8BIT),
247247
.mid_rid = 0x2a,
248248
},
@@ -256,7 +256,7 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
256256
{
257257
.slave_id = SHDMA_SLAVE_RIIC2_RX,
258258
.addr = 0x1e520013,
259-
.chcr = SM_INC | 0x800 | 0x40000000 |
259+
.chcr = DM_INC | 0x800 | 0x40000000 |
260260
TS_INDEX2VAL(XMIT_SZ_8BIT),
261261
.mid_rid = 0xa2,
262262
},
@@ -265,12 +265,12 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
265265
.addr = 0x1e530012,
266266
.chcr = SM_INC | 0x800 | 0x40000000 |
267267
TS_INDEX2VAL(XMIT_SZ_8BIT),
268-
.mid_rid = 0xab,
268+
.mid_rid = 0xa9,
269269
},
270270
{
271271
.slave_id = SHDMA_SLAVE_RIIC3_RX,
272272
.addr = 0x1e530013,
273-
.chcr = SM_INC | 0x800 | 0x40000000 |
273+
.chcr = DM_INC | 0x800 | 0x40000000 |
274274
TS_INDEX2VAL(XMIT_SZ_8BIT),
275275
.mid_rid = 0xaf,
276276
},
@@ -279,14 +279,14 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
279279
.addr = 0x1e540012,
280280
.chcr = SM_INC | 0x800 | 0x40000000 |
281281
TS_INDEX2VAL(XMIT_SZ_8BIT),
282-
.mid_rid = 0xc1,
282+
.mid_rid = 0xc5,
283283
},
284284
{
285285
.slave_id = SHDMA_SLAVE_RIIC4_RX,
286286
.addr = 0x1e540013,
287-
.chcr = SM_INC | 0x800 | 0x40000000 |
287+
.chcr = DM_INC | 0x800 | 0x40000000 |
288288
TS_INDEX2VAL(XMIT_SZ_8BIT),
289-
.mid_rid = 0xc2,
289+
.mid_rid = 0xc6,
290290
},
291291
};
292292

@@ -301,7 +301,7 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
301301
{
302302
.slave_id = SHDMA_SLAVE_RIIC5_RX,
303303
.addr = 0x1e550013,
304-
.chcr = SM_INC | 0x800 | 0x40000000 |
304+
.chcr = DM_INC | 0x800 | 0x40000000 |
305305
TS_INDEX2VAL(XMIT_SZ_8BIT),
306306
.mid_rid = 0x22,
307307
},
@@ -315,7 +315,7 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
315315
{
316316
.slave_id = SHDMA_SLAVE_RIIC6_RX,
317317
.addr = 0x1e560013,
318-
.chcr = SM_INC | 0x800 | 0x40000000 |
318+
.chcr = DM_INC | 0x800 | 0x40000000 |
319319
TS_INDEX2VAL(XMIT_SZ_8BIT),
320320
.mid_rid = 0x2a,
321321
},
@@ -329,7 +329,7 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
329329
{
330330
.slave_id = SHDMA_SLAVE_RIIC7_RX,
331331
.addr = 0x1e570013,
332-
.chcr = SM_INC | 0x800 | 0x40000000 |
332+
.chcr = DM_INC | 0x800 | 0x40000000 |
333333
TS_INDEX2VAL(XMIT_SZ_8BIT),
334334
.mid_rid = 0x42,
335335
},
@@ -343,7 +343,7 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
343343
{
344344
.slave_id = SHDMA_SLAVE_RIIC8_RX,
345345
.addr = 0x1e580013,
346-
.chcr = SM_INC | 0x800 | 0x40000000 |
346+
.chcr = DM_INC | 0x800 | 0x40000000 |
347347
TS_INDEX2VAL(XMIT_SZ_8BIT),
348348
.mid_rid = 0x46,
349349
},
@@ -357,7 +357,7 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
357357
{
358358
.slave_id = SHDMA_SLAVE_RIIC9_RX,
359359
.addr = 0x1e590013,
360-
.chcr = SM_INC | 0x800 | 0x40000000 |
360+
.chcr = DM_INC | 0x800 | 0x40000000 |
361361
TS_INDEX2VAL(XMIT_SZ_8BIT),
362362
.mid_rid = 0x52,
363363
},

0 commit comments

Comments
 (0)