On Mon, Apr 23, 2012 at 11:15:20AM +0800, Shawn Guo wrote: > On Wed, Apr 18, 2012 at 08:46:35PM +0800, Dong Aisheng wrote: > > From: Dong Aisheng <[email protected]> > > > > Cc: Grant Likely <[email protected]> > > Cc: Rob Herring <[email protected]> > > Cc: Rob Landley <[email protected]> > > Cc: Vinod Koul <[email protected]> > > Cc: Dan Williams <[email protected]> > > Cc: Shawn Guo <[email protected]> > > Cc: Sascha Hauer <[email protected]> > > Cc: Marek Vasut <[email protected]> > > Cc: Huang Shijie <[email protected]> > > Signed-off-by: Dong Aisheng <[email protected]> > > --- > > .../devicetree/bindings/dma/fsl-mxs-dma.txt | 19 +++++++++++++ > > drivers/dma/mxs-dma.c | 29 > > +++++++++++++++++--- > > 2 files changed, 44 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt > > b/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt > > new file mode 100644 > > index 0000000..ded0398 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt > > @@ -0,0 +1,19 @@ > > +* Freescale MXS DMA > > + > > +Required properties: > > +- compatible : Should be "fsl,<chip>-dma-apbh" or "fsl,<chip>-dma-apbx" > > +- reg : Should contain registers location and length > > + > > +Supported chips: > > +imx23, imx28. > > + > > +Examples: > > +dma-apbh@80004000 { > > + compatible = "fsl,imx28-dma-apbh"; > > + reg = <0x80004000 2000>; > > +}; > > + > > +dma-apbx@80024000 { > > + compatible = "fsl,imx28-dma-apbx"; > > + reg = <0x80024000 2000>; > > +}; > > diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c > > index 51a29f9..74c3275 100644 > > --- a/drivers/dma/mxs-dma.c > > +++ b/drivers/dma/mxs-dma.c > > @@ -22,8 +22,11 @@ > > #include <linux/platform_device.h> > > #include <linux/dmaengine.h> > > #include <linux/delay.h> > > +#include <linux/module.h> > > #include <linux/fsl/mxs-dma.h> > > #include <linux/stmp_device.h> > > +#include <linux/of.h> > > +#include <linux/of_device.h> > > > > #include <asm/irq.h> > > > > @@ -178,6 +181,17 @@ static struct platform_device_id mxs_dma_idt[] = { > > } > > }; > > > > +#ifdef CONFIG_OF > > +static const struct of_device_id mxs_dma_dt_ids[] = { > > + { .compatible = "fsl,imx23-dma-apbh", .data = &mxs_dma_idt[0], }, > > + { .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_idt[1], }, > > + { .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_idt[2], }, > > + { .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_idt[3], }, > > + { /* sentinel */ } > > +}; > > +MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); > > +#endif > > + > As out goal is to convert mxs over to DT, you can remove the #ifdef > here ... > But the non-dt is still exist, right? So i think we can keep it now unless we totally removed the non-dt code.
Regards Dong Aisheng _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
