Commit f5b7efcc authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo
Browse files

dma: mxs-dma: use global stmp_device functionality 



This can get rid of the mach-dependency.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Huang Shijie <b32955@freescale.com>
Signed-off-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 6c4d4efb

drivers/dma/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -238,6 +238,7 @@ config IMX_DMA 
config MXS_DMA

config MXS_DMA

	bool "MXS DMA support"

	bool "MXS DMA support"

	depends on SOC_IMX23 || SOC_IMX28

	depends on SOC_IMX23 || SOC_IMX28

	select STMP_DEVICE

	select DMA_ENGINE

	select DMA_ENGINE

	help

	help

	  Support the MXS DMA engine. This engine including APBH-DMA

	  Support the MXS DMA engine. This engine including APBH-DMA

drivers/dma/mxs-dma.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -23,10 +23,10 @@ 
#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/stmp_device.h>





#include <asm/irq.h>

#include <asm/irq.h>

#include <mach/mxs.h>

#include <mach/mxs.h>

#include <mach/common.h>





#include "dmaengine.h"

#include "dmaengine.h"
@@ -138,10 +138,10 @@ static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan) 




	if (dma_is_apbh() && apbh_is_old())

	if (dma_is_apbh() && apbh_is_old())

		writel(1 << (chan_id + BP_APBH_CTRL0_RESET_CHANNEL),

		writel(1 << (chan_id + BP_APBH_CTRL0_RESET_CHANNEL),

			mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);

	else

	else

		writel(1 << (chan_id + BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL),

		writel(1 << (chan_id + BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL),

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);

}

}





static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)

static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
@@ -170,10 +170,10 @@ static void mxs_dma_pause_chan(struct mxs_dma_chan *mxs_chan) 
	/* freeze the channel */

	/* freeze the channel */

	if (dma_is_apbh() && apbh_is_old())

	if (dma_is_apbh() && apbh_is_old())

		writel(1 << chan_id,

		writel(1 << chan_id,

			mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);

	else

	else

		writel(1 << chan_id,

		writel(1 << chan_id,

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);





	mxs_chan->status = DMA_PAUSED;

	mxs_chan->status = DMA_PAUSED;

}

}
@@ -186,10 +186,10 @@ static void mxs_dma_resume_chan(struct mxs_dma_chan *mxs_chan) 
	/* unfreeze the channel */

	/* unfreeze the channel */

	if (dma_is_apbh() && apbh_is_old())

	if (dma_is_apbh() && apbh_is_old())

		writel(1 << chan_id,

		writel(1 << chan_id,

			mxs_dma->base + HW_APBHX_CTRL0 + MXS_CLR_ADDR);

			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_CLR);

	else

	else

		writel(1 << chan_id,

		writel(1 << chan_id,

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + MXS_CLR_ADDR);

			mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_CLR);





	mxs_chan->status = DMA_IN_PROGRESS;

	mxs_chan->status = DMA_IN_PROGRESS;

}

}
@@ -220,11 +220,11 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id) 
	/* completion status */

	/* completion status */

	stat1 = readl(mxs_dma->base + HW_APBHX_CTRL1);

	stat1 = readl(mxs_dma->base + HW_APBHX_CTRL1);

	stat1 &= MXS_DMA_CHANNELS_MASK;

	stat1 &= MXS_DMA_CHANNELS_MASK;

	writel(stat1, mxs_dma->base + HW_APBHX_CTRL1 + MXS_CLR_ADDR);

	writel(stat1, mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_CLR);





	/* error status */

	/* error status */

	stat2 = readl(mxs_dma->base + HW_APBHX_CTRL2);

	stat2 = readl(mxs_dma->base + HW_APBHX_CTRL2);

	writel(stat2, mxs_dma->base + HW_APBHX_CTRL2 + MXS_CLR_ADDR);

	writel(stat2, mxs_dma->base + HW_APBHX_CTRL2 + STMP_OFFSET_REG_CLR);





	/*

	/*

	 * When both completion and error of termination bits set at the

	 * When both completion and error of termination bits set at the
@@ -567,7 +567,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = mxs_reset_block(mxs_dma->base);

	ret = stmp_reset_block(mxs_dma->base);

	if (ret)

	if (ret)

		goto err_out;

		goto err_out;
@@ -580,14 +580,14 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) 
	/* enable apbh burst */

	/* enable apbh burst */

	if (dma_is_apbh()) {

	if (dma_is_apbh()) {

		writel(BM_APBH_CTRL0_APB_BURST_EN,

		writel(BM_APBH_CTRL0_APB_BURST_EN,

			mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);

		writel(BM_APBH_CTRL0_APB_BURST8_EN,

		writel(BM_APBH_CTRL0_APB_BURST8_EN,

			mxs_dma->base + HW_APBHX_CTRL0 + MXS_SET_ADDR);

			mxs_dma->base + HW_APBHX_CTRL0 + STMP_OFFSET_REG_SET);

	}

	}





	/* enable irq for all the channels */

	/* enable irq for all the channels */

	writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS,

	writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS,

		mxs_dma->base + HW_APBHX_CTRL1 + MXS_SET_ADDR);

		mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET);





err_out:

err_out:

	clk_disable_unprepare(mxs_dma->clk);

	clk_disable_unprepare(mxs_dma->clk);