dmaengine: shdma: add dmaor_is_32bit flag

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 9412de3ef8993e6e1fa6af4f89428060d4ee8b71..6a21cd843ab77c17b0a55b892aff7a515a39d4f0 100644 (file)
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -70,12 +70,22 @@ static u32 sh_dmae_readl(struct sh_dmae_chan *sh_dc, u32 reg)
 
 static u16 dmaor_read(struct sh_dmae_device *shdev)
 {
-       return __raw_readw(shdev->chan_reg + DMAOR / sizeof(u32));
+       u32 __iomem *addr = shdev->chan_reg + DMAOR / sizeof(u32);
+
+       if (shdev->pdata->dmaor_is_32bit)
+               return __raw_readl(addr);
+       else
+               return __raw_readw(addr);
 }
 
 static void dmaor_write(struct sh_dmae_device *shdev, u16 data)
 {
-       __raw_writew(data, shdev->chan_reg + DMAOR / sizeof(u32));
+       u32 __iomem *addr = shdev->chan_reg + DMAOR / sizeof(u32);
+
+       if (shdev->pdata->dmaor_is_32bit)
+               __raw_writel(data, addr);
+       else
+               __raw_writew(data, addr);
 }
 
 static void chcr_write(struct sh_dmae_chan *sh_dc, u32 data)

diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 96803aa7b6bdb9470076e2d5a03fa2b066320b9f..f25afc61e1c6b79c9ca45e0c1b5df2ad9addabb1 100644 (file)
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -64,6 +64,8 @@ struct sh_dmae_pdata {
        u16 dmaor_init;
        unsigned int chcr_offset;
        u32 chcr_ie_bit;
+
+       unsigned int dmaor_is_32bit:1;
 };
 
 /* DMA register */