Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c920136 authored by Shawn Guo's avatar Shawn Guo
Browse files

dma: mxs-dma: make platform_device_id more generic 



Rewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support
other SoCs like imx6q and reform the platform_device_id for the
better further dt support.

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 avatarMarek Vasut <marex@denx.de>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
parent bb11fb63

arch/arm/mach-mxs/devices/platform-dma.c

+8 −6
Original line number Diff line number Diff line
@@ -32,17 +32,19 @@ static struct platform_device *__init mxs_add_dma(const char *devid, 


static int __init mxs_add_mxs_dma(void)

{

	char *apbh = "mxs-dma-apbh";

	char *apbx = "mxs-dma-apbx";

	char *mx23_apbh = "imx23-dma-apbh";

	char *mx23_apbx = "imx23-dma-apbx";

	char *mx28_apbh = "imx28-dma-apbh";

	char *mx28_apbx = "imx28-dma-apbx";



	if (cpu_is_mx23()) {

		mxs_add_dma(apbh, MX23_APBH_DMA_BASE_ADDR);

		mxs_add_dma(apbx, MX23_APBX_DMA_BASE_ADDR);

		mxs_add_dma(mx23_apbh, MX23_APBH_DMA_BASE_ADDR);

		mxs_add_dma(mx23_apbx, MX23_APBX_DMA_BASE_ADDR);

	}



	if (cpu_is_mx28()) {

		mxs_add_dma(apbh, MX28_APBH_DMA_BASE_ADDR);

		mxs_add_dma(apbx, MX28_APBX_DMA_BASE_ADDR);

		mxs_add_dma(mx28_apbh, MX28_APBH_DMA_BASE_ADDR);

		mxs_add_dma(mx28_apbx, MX28_APBX_DMA_BASE_ADDR);

	}



	return 0;

drivers/clk/mxs/clk-imx23.c

+2 −2
Original line number Diff line number Diff line
@@ -81,14 +81,14 @@ static struct clk_lookup uart_lookups[] __initdata = { 
};



static struct clk_lookup hbus_lookups[] __initdata = {

	{ .dev_id = "mxs-dma-apbh", },

	{ .dev_id = "imx23-dma-apbh", },

	{ .dev_id = "80004000.dma-apbh", },

};



static struct clk_lookup xbus_lookups[] __initdata = {

	{ .dev_id = "duart", .con_id = "apb_pclk"},

	{ .dev_id = "80070000.serial", .con_id = "apb_pclk"},

	{ .dev_id = "mxs-dma-apbx", },

	{ .dev_id = "imx23-dma-apbx", },

	{ .dev_id = "80024000.dma-apbx", },

};

drivers/clk/mxs/clk-imx28.c

+2 −2
Original line number Diff line number Diff line
@@ -136,14 +136,14 @@ static struct clk_lookup uart_lookups[] __initdata = { 
};



static struct clk_lookup hbus_lookups[] __initdata = {

	{ .dev_id = "mxs-dma-apbh", },

	{ .dev_id = "imx28-dma-apbh", },

	{ .dev_id = "80004000.dma-apbh", },

};



static struct clk_lookup xbus_lookups[] __initdata = {

	{ .dev_id = "duart", .con_id = "apb_pclk"},

	{ .dev_id = "80074000.serial", .con_id = "apb_pclk"},

	{ .dev_id = "mxs-dma-apbx", },

	{ .dev_id = "imx28-dma-apbx", },

	{ .dev_id = "80024000.dma-apbx", },

};

drivers/dma/mxs-dma.c

+79 −36
Original line number Diff line number Diff line
@@ -36,12 +36,8 @@ 
 * dma can program the controller registers of peripheral devices.

 */



#define MXS_DMA_APBH		0

#define MXS_DMA_APBX		1

#define dma_is_apbh(mxs_dma)	((mxs_dma)->dev_id == MXS_DMA_APBH)



#define APBH_VERSION_LATEST	3

#define apbh_is_old(mxs_dma)	((mxs_dma)->version < APBH_VERSION_LATEST)

#define dma_is_apbh(mxs_dma)	((mxs_dma)->type == MXS_DMA_APBH)

#define apbh_is_old(mxs_dma)	((mxs_dma)->dev_id == IMX23_DMA)



#define HW_APBHX_CTRL0				0x000

#define BM_APBH_CTRL0_APB_BURST8_EN		(1 << 29)
@@ -51,9 +47,6 @@ 
#define HW_APBHX_CTRL2				0x020

#define HW_APBHX_CHANNEL_CTRL			0x030

#define BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL	16

#define HW_APBH_VERSION				(cpu_is_mx23() ? 0x3f0 : 0x800)

#define HW_APBX_VERSION				0x800

#define BP_APBHX_VERSION_MAJOR			24

/*

 * The offset of NXTCMDAR register is different per both dma type and version,

 * while stride for each channel is all the same 0x70.
@@ -125,9 +118,19 @@ struct mxs_dma_chan { 
#define MXS_DMA_CHANNELS		16

#define MXS_DMA_CHANNELS_MASK		0xffff



enum mxs_dma_devtype {

	MXS_DMA_APBH,

	MXS_DMA_APBX,

};



enum mxs_dma_id {

	IMX23_DMA,

	IMX28_DMA,

};



struct mxs_dma_engine {

	int				dev_id;

	unsigned int			version;

	enum mxs_dma_id			dev_id;

	enum mxs_dma_devtype		type;

	void __iomem			*base;

	struct clk			*clk;

	struct dma_device		dma_device;
@@ -135,6 +138,66 @@ struct mxs_dma_engine { 
	struct mxs_dma_chan		mxs_chans[MXS_DMA_CHANNELS];

};



struct mxs_dma_type {

	enum mxs_dma_id id;

	enum mxs_dma_devtype type;

};



static struct mxs_dma_type mxs_dma_types[] = {

	{

		.id = IMX23_DMA,

		.type = MXS_DMA_APBH,

	}, {

		.id = IMX23_DMA,

		.type = MXS_DMA_APBX,

	}, {

		.id = IMX28_DMA,

		.type = MXS_DMA_APBH,

	}, {

		.id = IMX28_DMA,

		.type = MXS_DMA_APBX,

	}

};



static struct platform_device_id mxs_dma_ids[] = {

	{

		.name = "imx23-dma-apbh",

		.driver_data = (kernel_ulong_t) &mxs_dma_types[0],

	}, {

		.name = "imx23-dma-apbx",

		.driver_data = (kernel_ulong_t) &mxs_dma_types[1],

	}, {

		.name = "imx28-dma-apbh",

		.driver_data = (kernel_ulong_t) &mxs_dma_types[2],

	}, {

		.name = "imx28-dma-apbx",

		.driver_data = (kernel_ulong_t) &mxs_dma_types[3],

	}, {

		/* end of list */

	}

};



static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan)

{

	return container_of(chan, struct mxs_dma_chan, chan);

}



int mxs_dma_is_apbh(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;



	return dma_is_apbh(mxs_dma);

}



int mxs_dma_is_apbx(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;



	return !dma_is_apbh(mxs_dma);

}



static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)

{

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -198,11 +261,6 @@ static void mxs_dma_resume_chan(struct mxs_dma_chan *mxs_chan) 
	mxs_chan->status = DMA_IN_PROGRESS;

}



static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan)

{

	return container_of(chan, struct mxs_dma_chan, chan);

}



static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx)

{

	return dma_cookie_assign(tx);
@@ -575,12 +633,6 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) 
	if (ret)

		goto err_out;



	/* only major version matters */

	mxs_dma->version = readl(mxs_dma->base +

				((mxs_dma->dev_id == MXS_DMA_APBX) ?

				HW_APBX_VERSION : HW_APBH_VERSION)) >>

				BP_APBHX_VERSION_MAJOR;



	/* enable apbh burst */

	if (dma_is_apbh(mxs_dma)) {

		writel(BM_APBH_CTRL0_APB_BURST_EN,
@@ -602,6 +654,8 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
{

	const struct platform_device_id *id_entry =

				platform_get_device_id(pdev);

	const struct mxs_dma_type *dma_type =

			(struct mxs_dma_type *)id_entry->driver_data;

	struct mxs_dma_engine *mxs_dma;

	struct resource *iores;

	int ret, i;
@@ -610,7 +664,8 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	if (!mxs_dma)

		return -ENOMEM;



	mxs_dma->dev_id = id_entry->driver_data;

	mxs_dma->dev_id = dma_type->id;

	mxs_dma->type = dma_type->type;



	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -693,23 +748,11 @@ err_request_region: 
	return ret;

}



static struct platform_device_id mxs_dma_type[] = {

	{

		.name = "mxs-dma-apbh",

		.driver_data = MXS_DMA_APBH,

	}, {

		.name = "mxs-dma-apbx",

		.driver_data = MXS_DMA_APBX,

	}, {

		/* end of list */

	}

};



static struct platform_driver mxs_dma_driver = {

	.driver		= {

		.name	= "mxs-dma",

	},

	.id_table	= mxs_dma_type,

	.id_table	= mxs_dma_ids,

};



static int __init mxs_dma_module_init(void)

include/linux/fsl/mxs-dma.h

+2 −10
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ struct mxs_dma_data { 
	int chan_irq;

};



static inline int mxs_dma_is_apbh(struct dma_chan *chan)

{

	return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh");

}



static inline int mxs_dma_is_apbx(struct dma_chan *chan)

{

	return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx");

}



extern int mxs_dma_is_apbh(struct dma_chan *chan);

extern int mxs_dma_is_apbx(struct dma_chan *chan);

#endif /* __MACH_MXS_DMA_H__ */