diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-06-17 04:20:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 04:56:01 -0400 |
commit | 67c6269e5c998b53c2c08ce2befbbe20a7b6f57f (patch) | |
tree | f06100f0cb5717ce5e1ef89cbd7bd12830165ed5 /drivers/dma/shdma.c | |
parent | 5899a723b336da241b492583d7e55f1055f8f3b3 (diff) |
dmaengine: shdma: add chcr_ie_bit
IE bit position on CHCR register is not same in all DMAC.
This patch adds new "chcr_ie_bit" to decide it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/dma/shdma.c')
-rw-r--r-- | drivers/dma/shdma.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 40900c1cee9a..9412de3ef899 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
@@ -181,17 +181,19 @@ static void dmae_set_reg(struct sh_dmae_chan *sh_chan, struct sh_dmae_regs *hw) | |||
181 | 181 | ||
182 | static void dmae_start(struct sh_dmae_chan *sh_chan) | 182 | static void dmae_start(struct sh_dmae_chan *sh_chan) |
183 | { | 183 | { |
184 | struct sh_dmae_device *shdev = to_sh_dev(sh_chan); | ||
184 | u32 chcr = chcr_read(sh_chan); | 185 | u32 chcr = chcr_read(sh_chan); |
185 | 186 | ||
186 | chcr |= CHCR_DE | CHCR_IE; | 187 | chcr |= CHCR_DE | shdev->chcr_ie_bit; |
187 | chcr_write(sh_chan, chcr & ~CHCR_TE); | 188 | chcr_write(sh_chan, chcr & ~CHCR_TE); |
188 | } | 189 | } |
189 | 190 | ||
190 | static void dmae_halt(struct sh_dmae_chan *sh_chan) | 191 | static void dmae_halt(struct sh_dmae_chan *sh_chan) |
191 | { | 192 | { |
193 | struct sh_dmae_device *shdev = to_sh_dev(sh_chan); | ||
192 | u32 chcr = chcr_read(sh_chan); | 194 | u32 chcr = chcr_read(sh_chan); |
193 | 195 | ||
194 | chcr &= ~(CHCR_DE | CHCR_TE | CHCR_IE); | 196 | chcr &= ~(CHCR_DE | CHCR_TE | shdev->chcr_ie_bit); |
195 | chcr_write(sh_chan, chcr); | 197 | chcr_write(sh_chan, chcr); |
196 | } | 198 | } |
197 | 199 | ||
@@ -1157,6 +1159,11 @@ static int __init sh_dmae_probe(struct platform_device *pdev) | |||
1157 | else | 1159 | else |
1158 | shdev->chcr_offset = CHCR; | 1160 | shdev->chcr_offset = CHCR; |
1159 | 1161 | ||
1162 | if (pdata->chcr_ie_bit) | ||
1163 | shdev->chcr_ie_bit = pdata->chcr_ie_bit; | ||
1164 | else | ||
1165 | shdev->chcr_ie_bit = CHCR_IE; | ||
1166 | |||
1160 | platform_set_drvdata(pdev, shdev); | 1167 | platform_set_drvdata(pdev, shdev); |
1161 | 1168 | ||
1162 | pm_runtime_enable(&pdev->dev); | 1169 | pm_runtime_enable(&pdev->dev); |