dmaengine: shdma: add chcr_write/read function

CHCR register position is not same in all DMAC.
This patch adds new "chcr_offset" to decide it.

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 41a21b3..40900c1 100644 (file)
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -78,6 +78,20 @@ static void dmaor_write(struct sh_dmae_device *shdev, u16 data)
        __raw_writew(data, shdev->chan_reg + DMAOR / sizeof(u32));
 }
 
        __raw_writew(data, shdev->chan_reg + DMAOR / sizeof(u32));
 }
 

+static void chcr_write(struct sh_dmae_chan *sh_dc, u32 data)
+{
+       struct sh_dmae_device *shdev = to_sh_dev(sh_dc);
+
+       __raw_writel(data, sh_dc->base + shdev->chcr_offset / sizeof(u32));
+}
+
+static u32 chcr_read(struct sh_dmae_chan *sh_dc)
+{
+       struct sh_dmae_device *shdev = to_sh_dev(sh_dc);
+
+       return __raw_readl(sh_dc->base + shdev->chcr_offset / sizeof(u32));
+}
+

 /*
  * Reset DMA controller
  *
 /*
  * Reset DMA controller
  *


@@ -120,7 +134,7 @@ static int sh_dmae_rst(struct sh_dmae_device *shdev)
 
 static bool dmae_is_busy(struct sh_dmae_chan *sh_chan)
 {
 
 static bool dmae_is_busy(struct sh_dmae_chan *sh_chan)
 {

-       u32 chcr = sh_dmae_readl(sh_chan, CHCR);
+       u32 chcr = chcr_read(sh_chan);

 
        if ((chcr & (CHCR_DE | CHCR_TE)) == CHCR_DE)
                return true; /* working */
 
        if ((chcr & (CHCR_DE | CHCR_TE)) == CHCR_DE)
                return true; /* working */


@@ -167,18 +181,18 @@ 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)
 {

-       u32 chcr = sh_dmae_readl(sh_chan, CHCR);
+       u32 chcr = chcr_read(sh_chan);

 
        chcr |= CHCR_DE | CHCR_IE;
 
        chcr |= CHCR_DE | CHCR_IE;

-       sh_dmae_writel(sh_chan, chcr & ~CHCR_TE, CHCR);
+       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)
 {

-       u32 chcr = sh_dmae_readl(sh_chan, CHCR);
+       u32 chcr = chcr_read(sh_chan);

 
        chcr &= ~(CHCR_DE | CHCR_TE | CHCR_IE);
 
        chcr &= ~(CHCR_DE | CHCR_TE | CHCR_IE);

-       sh_dmae_writel(sh_chan, chcr, CHCR);
+       chcr_write(sh_chan, chcr);

 }
 
 static void dmae_init(struct sh_dmae_chan *sh_chan)
 }
 
 static void dmae_init(struct sh_dmae_chan *sh_chan)


@@ -190,7 +204,7 @@ static void dmae_init(struct sh_dmae_chan *sh_chan)
        u32 chcr = DM_INC | SM_INC | 0x400 | log2size_to_chcr(sh_chan,
                                                   LOG2_DEFAULT_XFER_SIZE);
        sh_chan->xmit_shift = calc_xmit_shift(sh_chan, chcr);
        u32 chcr = DM_INC | SM_INC | 0x400 | log2size_to_chcr(sh_chan,
                                                   LOG2_DEFAULT_XFER_SIZE);
        sh_chan->xmit_shift = calc_xmit_shift(sh_chan, chcr);

-       sh_dmae_writel(sh_chan, chcr, CHCR);
+       chcr_write(sh_chan, chcr);

 }
 
 static int dmae_set_chcr(struct sh_dmae_chan *sh_chan, u32 val)
 }
 
 static int dmae_set_chcr(struct sh_dmae_chan *sh_chan, u32 val)


@@ -200,7 +214,7 @@ static int dmae_set_chcr(struct sh_dmae_chan *sh_chan, u32 val)
                return -EBUSY;
 
        sh_chan->xmit_shift = calc_xmit_shift(sh_chan, val);
                return -EBUSY;
 
        sh_chan->xmit_shift = calc_xmit_shift(sh_chan, val);

-       sh_dmae_writel(sh_chan, val, CHCR);
+       chcr_write(sh_chan, val);

 
        return 0;
 }
 
        return 0;
 }


@@ -840,7 +854,7 @@ static irqreturn_t sh_dmae_interrupt(int irq, void *data)
 
        spin_lock(&sh_chan->desc_lock);
 
 
        spin_lock(&sh_chan->desc_lock);
 

-       chcr = sh_dmae_readl(sh_chan, CHCR);
+       chcr = chcr_read(sh_chan);

 
        if (chcr & CHCR_TE) {
                /* DMA stop */
 
        if (chcr & CHCR_TE) {
                /* DMA stop */


@@ -1138,6 +1152,11 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
        /* platform data */
        shdev->pdata = pdata;
 
        /* platform data */
        shdev->pdata = pdata;
 

+       if (pdata->chcr_offset)
+               shdev->chcr_offset = pdata->chcr_offset;
+       else
+               shdev->chcr_offset = CHCR;
+

        platform_set_drvdata(pdev, shdev);
 
        pm_runtime_enable(&pdev->dev);
        platform_set_drvdata(pdev, shdev);
 
        pm_runtime_enable(&pdev->dev);

diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 6c73b65..6f064ca 100644 (file)
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -47,6 +47,7 @@ struct sh_dmae_device {
        struct list_head node;
        u32 __iomem *chan_reg;
        u16 __iomem *dmars;
        struct list_head node;
        u32 __iomem *chan_reg;
        u16 __iomem *dmars;

+       unsigned int chcr_offset;

 };
 
 #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)

diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index b08cd4e..41fe4c2 100644 (file)
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -62,6 +62,7 @@ struct sh_dmae_pdata {
        const unsigned int *ts_shift;
        int ts_shift_num;
        u16 dmaor_init;
        const unsigned int *ts_shift;
        int ts_shift_num;
        u16 dmaor_init;

+       unsigned int chcr_offset;

 };
 
 /* DMA register */
 };
 
 /* DMA register */