hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmaengine: mmp-tdma: Split device_control 

Split the device_control callback of the Marvell MMP TDMA driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Maxime Ripard 2014-11-17 14:42:22 +01:00 committed by Vinod Koul
parent a0abd6719b
commit f43a6fd400
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
drivers/dma/mmp_tdma.c
View File

@ -164,33 +164,46 @@ static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
tdmac->status = DMA_IN_PROGRESS; tdmac->status = DMA_IN_PROGRESS;
} }
static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac) static int mmp_tdma_disable_chan(struct dma_chan *chan)
{ {
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN, writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
tdmac->reg_base + TDCR); tdmac->reg_base + TDCR);
tdmac->status = DMA_COMPLETE; tdmac->status = DMA_COMPLETE;
return 0;
} }
static void mmp_tdma_resume_chan(struct mmp_tdma_chan *tdmac) static int mmp_tdma_resume_chan(struct dma_chan *chan)
{ {
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN, writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
tdmac->reg_base + TDCR); tdmac->reg_base + TDCR);
tdmac->status = DMA_IN_PROGRESS; tdmac->status = DMA_IN_PROGRESS;
return 0;
} }
static void mmp_tdma_pause_chan(struct mmp_tdma_chan *tdmac) static int mmp_tdma_pause_chan(struct dma_chan *chan)
{ {
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN, writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
tdmac->reg_base + TDCR); tdmac->reg_base + TDCR);
tdmac->status = DMA_PAUSED; tdmac->status = DMA_PAUSED;
return 0;
} }
static int mmp_tdma_config_chan(struct mmp_tdma_chan *tdmac) static int mmp_tdma_config_chan(struct dma_chan *chan)
{ {
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
unsigned int tdcr = 0; unsigned int tdcr = 0;
mmp_tdma_disable_chan(tdmac); mmp_tdma_disable_chan(chan);
if (tdmac->dir == DMA_MEM_TO_DEV) if (tdmac->dir == DMA_MEM_TO_DEV)
tdcr = TDCR_DSTDIR_ADDR_HOLD | TDCR_SRCDIR_ADDR_INC; tdcr = TDCR_DSTDIR_ADDR_HOLD | TDCR_SRCDIR_ADDR_INC;
@ -452,42 +465,32 @@ err_out:
return NULL; return NULL;
} }
static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, static int mmp_tdma_terminate_all(struct dma_chan *chan)
unsigned long arg)
{ {
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan); struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
struct dma_slave_config *dmaengine_cfg = (void *)arg;
int ret = 0;
switch (cmd) { mmp_tdma_disable_chan(chan);
case DMA_TERMINATE_ALL: /* disable interrupt */
mmp_tdma_disable_chan(tdmac); mmp_tdma_enable_irq(tdmac, false);
/* disable interrupt */ }
mmp_tdma_enable_irq(tdmac, false);
break; static int mmp_tdma_config(struct dma_chan *chan,
case DMA_PAUSE: struct dma_slave_config *dmaengine_cfg)
mmp_tdma_pause_chan(tdmac); {
break; struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
case DMA_RESUME:
mmp_tdma_resume_chan(tdmac); if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
break; tdmac->dev_addr = dmaengine_cfg->src_addr;
case DMA_SLAVE_CONFIG: tdmac->burst_sz = dmaengine_cfg->src_maxburst;
if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) { tdmac->buswidth = dmaengine_cfg->src_addr_width;
tdmac->dev_addr = dmaengine_cfg->src_addr; } else {
tdmac->burst_sz = dmaengine_cfg->src_maxburst; tdmac->dev_addr = dmaengine_cfg->dst_addr;
tdmac->buswidth = dmaengine_cfg->src_addr_width; tdmac->burst_sz = dmaengine_cfg->dst_maxburst;
} else { tdmac->buswidth = dmaengine_cfg->dst_addr_width;
tdmac->dev_addr = dmaengine_cfg->dst_addr;
tdmac->burst_sz = dmaengine_cfg->dst_maxburst;
tdmac->buswidth = dmaengine_cfg->dst_addr_width;
}
tdmac->dir = dmaengine_cfg->direction;
return mmp_tdma_config_chan(tdmac);
default:
ret = -ENOSYS;
} }
tdmac->dir = dmaengine_cfg->direction;
return ret; return mmp_tdma_config_chan(chan);
} }
static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan, static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan,
@ -668,7 +671,10 @@ static int mmp_tdma_probe(struct platform_device *pdev)
tdev->device.device_prep_dma_cyclic = mmp_tdma_prep_dma_cyclic; tdev->device.device_prep_dma_cyclic = mmp_tdma_prep_dma_cyclic;
tdev->device.device_tx_status = mmp_tdma_tx_status; tdev->device.device_tx_status = mmp_tdma_tx_status;
tdev->device.device_issue_pending = mmp_tdma_issue_pending; tdev->device.device_issue_pending = mmp_tdma_issue_pending;
tdev->device.device_control = mmp_tdma_control; tdev->device.device_config = mmp_tdma_config;
tdev->device.device_pause = mmp_tdma_pause_chan;
tdev->device.device_resume = mmp_tdma_resume_chan;
tdev->device.device_terminate_all = mmp_tdma_terminate_all;
tdev->device.copy_align = TDMA_ALIGNMENT; tdev->device.copy_align = TDMA_ALIGNMENT;
dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));