1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 9412de3ef899..6a21cd843ab7 100644
--- 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)