diff options
| author | Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com> | 2012-07-25 03:53:21 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-26 01:16:09 -0400 |
| commit | b9ccfda293ee6fca9a89a1584f0900e0627b975e (patch) | |
| tree | 95b48f68c5da5286c1f6dfbd1eae0c373f8c71c2 | |
| parent | a3fd869a6425082f6014ded43684508602319900 (diff) | |
sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
Modify the sh7757_dmae1_slave to add paramters of RSPI's slave_id.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sh7757.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7757.h b/arch/sh/include/cpu-sh4/cpu/sh7757.h index 41f9f8b9db73..5340f3bc1863 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7757.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7757.h | |||
| @@ -283,5 +283,7 @@ enum { | |||
| 283 | SHDMA_SLAVE_RIIC8_RX, | 283 | SHDMA_SLAVE_RIIC8_RX, |
| 284 | SHDMA_SLAVE_RIIC9_TX, | 284 | SHDMA_SLAVE_RIIC9_TX, |
| 285 | SHDMA_SLAVE_RIIC9_RX, | 285 | SHDMA_SLAVE_RIIC9_RX, |
| 286 | SHDMA_SLAVE_RSPI_TX, | ||
| 287 | SHDMA_SLAVE_RSPI_RX, | ||
| 286 | }; | 288 | }; |
| 287 | #endif /* __ASM_SH7757_H__ */ | 289 | #endif /* __ASM_SH7757_H__ */ |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c index a7708425afa9..4a2f357f4df8 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | |||
| @@ -216,6 +216,20 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = { | |||
| 216 | TS_INDEX2VAL(XMIT_SZ_8BIT), | 216 | TS_INDEX2VAL(XMIT_SZ_8BIT), |
| 217 | .mid_rid = 0x42, | 217 | .mid_rid = 0x42, |
| 218 | }, | 218 | }, |
| 219 | { | ||
| 220 | .slave_id = SHDMA_SLAVE_RSPI_TX, | ||
| 221 | .addr = 0xfe480004, | ||
| 222 | .chcr = SM_INC | 0x800 | 0x40000000 | | ||
| 223 | TS_INDEX2VAL(XMIT_SZ_16BIT), | ||
| 224 | .mid_rid = 0xc1, | ||
| 225 | }, | ||
| 226 | { | ||
| 227 | .slave_id = SHDMA_SLAVE_RSPI_RX, | ||
| 228 | .addr = 0xfe480004, | ||
| 229 | .chcr = DM_INC | 0x800 | 0x40000000 | | ||
| 230 | TS_INDEX2VAL(XMIT_SZ_16BIT), | ||
| 231 | .mid_rid = 0xc2, | ||
| 232 | }, | ||
| 219 | }; | 233 | }; |
| 220 | 234 | ||
| 221 | static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = { | 235 | static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = { |
