lkml.org 
[lkml]   [2018]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/7] dmaengine: fsldma: Replace DMA_IN/OUT by FSL_DMA_IN/OUT
    Date
    From: Wen He <wen.he_1@nxp.com>

    This patch implement a standard macro call functions is
    used to NXP dma drivers.

    Signed-off-by: Wen He <wen.he_1@nxp.com>
    ---
    drivers/dma/fsldma.c | 16 ++++++++--------
    drivers/dma/fsldma.h | 4 ++--
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
    index 1117b51..39871e0 100644
    --- a/drivers/dma/fsldma.c
    +++ b/drivers/dma/fsldma.c
    @@ -53,42 +53,42 @@

    static void set_sr(struct fsldma_chan *chan, u32 val)
    {
    - DMA_OUT(chan, &chan->regs->sr, val, 32);
    + FSL_DMA_OUT(chan, &chan->regs->sr, val, 32);
    }

    static u32 get_sr(struct fsldma_chan *chan)
    {
    - return DMA_IN(chan, &chan->regs->sr, 32);
    + return FSL_DMA_IN(chan, &chan->regs->sr, 32);
    }

    static void set_mr(struct fsldma_chan *chan, u32 val)
    {
    - DMA_OUT(chan, &chan->regs->mr, val, 32);
    + FSL_DMA_OUT(chan, &chan->regs->mr, val, 32);
    }

    static u32 get_mr(struct fsldma_chan *chan)
    {
    - return DMA_IN(chan, &chan->regs->mr, 32);
    + return FSL_DMA_IN(chan, &chan->regs->mr, 32);
    }

    static void set_cdar(struct fsldma_chan *chan, dma_addr_t addr)
    {
    - DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
    + FSL_DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
    }

    static dma_addr_t get_cdar(struct fsldma_chan *chan)
    {
    - return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
    + return FSL_DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
    }

    static void set_bcr(struct fsldma_chan *chan, u32 val)
    {
    - DMA_OUT(chan, &chan->regs->bcr, val, 32);
    + FSL_DMA_OUT(chan, &chan->regs->bcr, val, 32);
    }

    static u32 get_bcr(struct fsldma_chan *chan)
    {
    - return DMA_IN(chan, &chan->regs->bcr, 32);
    + return FSL_DMA_IN(chan, &chan->regs->bcr, 32);
    }

    /*
    diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
    index 4787d48..982845b 100644
    --- a/drivers/dma/fsldma.h
    +++ b/drivers/dma/fsldma.h
    @@ -223,10 +223,10 @@ static void out_le64(u64 __iomem *addr, u64 val)
    }
    #endif

    -#define DMA_IN(fsl_chan, addr, width) \
    +#define FSL_DMA_IN(fsl_chan, addr, width) \
    (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \
    in_be##width(addr) : in_le##width(addr))
    -#define DMA_OUT(fsl_chan, addr, val, width) \
    +#define FSL_DMA_OUT(fsl_chan, addr, val, width) \
    (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \
    out_be##width(addr, val) : out_le##width(addr, val))

    --
    1.7.1
    \
     
     \ /
      Last update: 2018-10-11 11:51    [W:4.371 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site