mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
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: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
bb11fb63fc
commit
8c92013643
5 changed files with 93 additions and 56 deletions
|
@ -32,17 +32,19 @@ static struct platform_device *__init mxs_add_dma(const char *devid,
|
||||||
|
|
||||||
static int __init mxs_add_mxs_dma(void)
|
static int __init mxs_add_mxs_dma(void)
|
||||||
{
|
{
|
||||||
char *apbh = "mxs-dma-apbh";
|
char *mx23_apbh = "imx23-dma-apbh";
|
||||||
char *apbx = "mxs-dma-apbx";
|
char *mx23_apbx = "imx23-dma-apbx";
|
||||||
|
char *mx28_apbh = "imx28-dma-apbh";
|
||||||
|
char *mx28_apbx = "imx28-dma-apbx";
|
||||||
|
|
||||||
if (cpu_is_mx23()) {
|
if (cpu_is_mx23()) {
|
||||||
mxs_add_dma(apbh, MX23_APBH_DMA_BASE_ADDR);
|
mxs_add_dma(mx23_apbh, MX23_APBH_DMA_BASE_ADDR);
|
||||||
mxs_add_dma(apbx, MX23_APBX_DMA_BASE_ADDR);
|
mxs_add_dma(mx23_apbx, MX23_APBX_DMA_BASE_ADDR);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cpu_is_mx28()) {
|
if (cpu_is_mx28()) {
|
||||||
mxs_add_dma(apbh, MX28_APBH_DMA_BASE_ADDR);
|
mxs_add_dma(mx28_apbh, MX28_APBH_DMA_BASE_ADDR);
|
||||||
mxs_add_dma(apbx, MX28_APBX_DMA_BASE_ADDR);
|
mxs_add_dma(mx28_apbx, MX28_APBX_DMA_BASE_ADDR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -81,14 +81,14 @@ static struct clk_lookup uart_lookups[] __initdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct clk_lookup hbus_lookups[] __initdata = {
|
static struct clk_lookup hbus_lookups[] __initdata = {
|
||||||
{ .dev_id = "mxs-dma-apbh", },
|
{ .dev_id = "imx23-dma-apbh", },
|
||||||
{ .dev_id = "80004000.dma-apbh", },
|
{ .dev_id = "80004000.dma-apbh", },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct clk_lookup xbus_lookups[] __initdata = {
|
static struct clk_lookup xbus_lookups[] __initdata = {
|
||||||
{ .dev_id = "duart", .con_id = "apb_pclk"},
|
{ .dev_id = "duart", .con_id = "apb_pclk"},
|
||||||
{ .dev_id = "80070000.serial", .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", },
|
{ .dev_id = "80024000.dma-apbx", },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -136,14 +136,14 @@ static struct clk_lookup uart_lookups[] __initdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct clk_lookup hbus_lookups[] __initdata = {
|
static struct clk_lookup hbus_lookups[] __initdata = {
|
||||||
{ .dev_id = "mxs-dma-apbh", },
|
{ .dev_id = "imx28-dma-apbh", },
|
||||||
{ .dev_id = "80004000.dma-apbh", },
|
{ .dev_id = "80004000.dma-apbh", },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct clk_lookup xbus_lookups[] __initdata = {
|
static struct clk_lookup xbus_lookups[] __initdata = {
|
||||||
{ .dev_id = "duart", .con_id = "apb_pclk"},
|
{ .dev_id = "duart", .con_id = "apb_pclk"},
|
||||||
{ .dev_id = "80074000.serial", .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", },
|
{ .dev_id = "80024000.dma-apbx", },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -36,12 +36,8 @@
|
||||||
* dma can program the controller registers of peripheral devices.
|
* dma can program the controller registers of peripheral devices.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define MXS_DMA_APBH 0
|
#define dma_is_apbh(mxs_dma) ((mxs_dma)->type == MXS_DMA_APBH)
|
||||||
#define MXS_DMA_APBX 1
|
#define apbh_is_old(mxs_dma) ((mxs_dma)->dev_id == IMX23_DMA)
|
||||||
#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 HW_APBHX_CTRL0 0x000
|
#define HW_APBHX_CTRL0 0x000
|
||||||
#define BM_APBH_CTRL0_APB_BURST8_EN (1 << 29)
|
#define BM_APBH_CTRL0_APB_BURST8_EN (1 << 29)
|
||||||
|
@ -51,9 +47,6 @@
|
||||||
#define HW_APBHX_CTRL2 0x020
|
#define HW_APBHX_CTRL2 0x020
|
||||||
#define HW_APBHX_CHANNEL_CTRL 0x030
|
#define HW_APBHX_CHANNEL_CTRL 0x030
|
||||||
#define BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL 16
|
#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,
|
* The offset of NXTCMDAR register is different per both dma type and version,
|
||||||
* while stride for each channel is all the same 0x70.
|
* 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 16
|
||||||
#define MXS_DMA_CHANNELS_MASK 0xffff
|
#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 {
|
struct mxs_dma_engine {
|
||||||
int dev_id;
|
enum mxs_dma_id dev_id;
|
||||||
unsigned int version;
|
enum mxs_dma_devtype type;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
struct dma_device dma_device;
|
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_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)
|
static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
|
||||||
{
|
{
|
||||||
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
|
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;
|
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)
|
static dma_cookie_t mxs_dma_tx_submit(struct dma_async_tx_descriptor *tx)
|
||||||
{
|
{
|
||||||
return dma_cookie_assign(tx);
|
return dma_cookie_assign(tx);
|
||||||
|
@ -575,12 +633,6 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_out;
|
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 */
|
/* enable apbh burst */
|
||||||
if (dma_is_apbh(mxs_dma)) {
|
if (dma_is_apbh(mxs_dma)) {
|
||||||
writel(BM_APBH_CTRL0_APB_BURST_EN,
|
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 =
|
const struct platform_device_id *id_entry =
|
||||||
platform_get_device_id(pdev);
|
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 mxs_dma_engine *mxs_dma;
|
||||||
struct resource *iores;
|
struct resource *iores;
|
||||||
int ret, i;
|
int ret, i;
|
||||||
|
@ -610,7 +664,8 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
|
||||||
if (!mxs_dma)
|
if (!mxs_dma)
|
||||||
return -ENOMEM;
|
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);
|
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
|
||||||
|
@ -693,23 +748,11 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
|
||||||
return ret;
|
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 = {
|
static struct platform_driver mxs_dma_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "mxs-dma",
|
.name = "mxs-dma",
|
||||||
},
|
},
|
||||||
.id_table = mxs_dma_type,
|
.id_table = mxs_dma_ids,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init mxs_dma_module_init(void)
|
static int __init mxs_dma_module_init(void)
|
||||||
|
|
|
@ -15,14 +15,6 @@ struct mxs_dma_data {
|
||||||
int chan_irq;
|
int chan_irq;
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline int mxs_dma_is_apbh(struct dma_chan *chan)
|
extern int mxs_dma_is_apbh(struct dma_chan *chan);
|
||||||
{
|
extern int mxs_dma_is_apbx(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");
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* __MACH_MXS_DMA_H__ */
|
#endif /* __MACH_MXS_DMA_H__ */
|
||||||
|
|
Loading…
Reference in a new issue