evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dmaengine: shdma: add chcr_ie_bit

Browse source 
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>
This commit is contained in:
Kuninori Morimoto 2011-06-17 08:20:51 +00:00 • committed by Paul Mundt
parent 5899a723b3
commit 67c6269e5c
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/dma/shdma.c
View file

@ -181,17 +181,19 @@ static void dmae_set_reg(struct sh_dmae_chan *sh_chan, struct sh_dmae_regs *hw)
static void dmae_start(struct sh_dmae_chan *sh_chan) static void dmae_start(struct sh_dmae_chan *sh_chan)
{ {
struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
u32 chcr = chcr_read(sh_chan); u32 chcr = chcr_read(sh_chan);
chcr |= CHCR_DE | CHCR_IE; chcr |= CHCR_DE | shdev->chcr_ie_bit;
chcr_write(sh_chan, chcr & ~CHCR_TE); chcr_write(sh_chan, chcr & ~CHCR_TE);
} }
static void dmae_halt(struct sh_dmae_chan *sh_chan) static void dmae_halt(struct sh_dmae_chan *sh_chan)
{ {
struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
u32 chcr = chcr_read(sh_chan); u32 chcr = chcr_read(sh_chan);
chcr &= ~(CHCR_DE | CHCR_TE | CHCR_IE); chcr &= ~(CHCR_DE | CHCR_TE | shdev->chcr_ie_bit);
chcr_write(sh_chan, chcr); chcr_write(sh_chan, chcr);
} }
@ -1157,6 +1159,11 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
else else
shdev->chcr_offset = CHCR; shdev->chcr_offset = CHCR;
if (pdata->chcr_ie_bit)
shdev->chcr_ie_bit = pdata->chcr_ie_bit;
else
shdev->chcr_ie_bit = CHCR_IE;
platform_set_drvdata(pdev, shdev); platform_set_drvdata(pdev, shdev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);

1
drivers/dma/shdma.h
View file

@ -48,6 +48,7 @@ struct sh_dmae_device {
u32 __iomem *chan_reg; u32 __iomem *chan_reg;
u16 __iomem *dmars; u16 __iomem *dmars;
unsigned int chcr_offset; unsigned int chcr_offset;
u32 chcr_ie_bit;
}; };
#define to_sh_chan(chan) container_of(chan, struct sh_dmae_chan, common) #define to_sh_chan(chan) container_of(chan, struct sh_dmae_chan, common)

1
include/linux/sh_dma.h
View file

@ -63,6 +63,7 @@ struct sh_dmae_pdata {
int ts_shift_num; int ts_shift_num;
u16 dmaor_init; u16 dmaor_init;
unsigned int chcr_offset; unsigned int chcr_offset;
u32 chcr_ie_bit;
}; };
/* DMA register */ /* DMA register */