dmaengine: imx-dma: Add device tree probe support
Subsystems (3)
PATCH 1/2 dmaengine: imx-dma: Add device tree probe support
This patch adds device tree probe support for imx-dma driver.
Signed-off-by Alexander Shiyan <[email protected]>
--- .../devicetree/bindings/dma/fsl-imx-dma.txt | 18 ++++++++++++++++++ drivers/dma/imx-dma.c | 21 +++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
Documentation/devicetree/bindings/dma/fsl-imx-dma.txt new file +18 -0
@@ -0,0 +1,18 @@ +* Freescale Direct Memory Access (DMA) Controller for i.MX + +Required properties: +- compatible: Should be "fsl,<chip>-dma" +- reg: Should contain DMA registers location and length +- interrupts: Should contain DMA interrupt +- clocks: Pointer to the reference clocks +- clock-names: Names of DMA reference clocks + +Examples: + +dma: dma at 10001000 { + compatible = "fsl,imx27-dma"; + reg = <0x10001000 0x1000>; + interrupts = <32>; + clocks = <&clks 50>, <&clks 70>; + clock-names = "ipg", "ahb"; +};
drivers/dma/imx-dma.c +19 -2
@@ -27,6 +27,8 @@#include <linux/clk.h> #include <linux/dmaengine.h> #include <linux/module.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/irq.h> #include <linux/platform_data/dma-imx.h>
@@ -202,6 +204,14 @@ static struct platform_device_id imx_dma_devtype[] = { };MODULE_DEVICE_TABLE (platform, imx_dma_devtype); +static const struct of_device_id imx_dma_dt_ids[] = { + { .compatible ="fsl,imx1-dma" , .data = &imx_dma_devtype[IMX1_DMA ], }, + { .compatible ="fsl,imx21-dma" , .data = &imx_dma_devtype[IMX21_DMA ], }, + { .compatible ="fsl,imx27-dma" , .data = &imx_dma_devtype[IMX27_DMA ], }, + { } +}; +MODULE_DEVICE_TABLE (of, imx_dma_dt_ids); +static inline int is_imx1_dma (struct imxdma_engine *imxdma) {return imxdma->devtype ==IMX1_DMA ;
@@ -997,7 +1007,9 @@ static void imxdma_issue_pending(struct dma_chan *chan) }static int __init imxdma_probe (struct platform_device *pdev) - { +{ +const struct of_device_id *of_id = +of_match_device (imx_dma_dt_ids, &pdev->dev);struct imxdma_engine *imxdma;struct resource *res;int ret, i;
@@ -1007,6 +1019,8 @@ static int __init imxdma_probe(struct platform_device *pdev)if (!imxdma)return -ENOMEM ; +if (of_id) + pdev->id_entry = of_id->data; imxdma->devtype = pdev->id_entry->driver_data; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -1136,6 +1150,8 @@ static int __init imxdma_probe(struct platform_device *pdev) goto err; } +dev_info (imxdma->dev,"initialized\n" ); +return 0 ; err:
@@ -1158,7 +1174,8 @@ static int imxdma_remove(struct platform_device *pdev)static struct platform_driver imxdma_driver = { .driver = { - .name ="imx-dma" , + .name ="imx-dma" , + .of_match_table = imx_dma_dt_ids, }, .id_table = imx_dma_devtype, .remove = imxdma_remove,
Signature · 1 line
1.8.1.5
PATCH 2/2 ARM: dts: Add DMA support to imx27 device tree
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/boot/dts/imx27.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx27.dtsi +8 -0
@@ -61,6 +61,14 @@ reg = <0x10000000 0x20000>; ranges; + dma: dma at 10001000 { + compatible = "fsl,imx27-dma"; + reg = <0x10001000 0x1000>; + interrupts = <32>; + clocks = <&clks 50>, <&clks 70>; + clock-names = "ipg", "ahb"; + }; + wdog: wdog at 10002000 { compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; reg = <0x10002000 0x1000>;
Signature · 1 line
1.8.1.5
Sascha Hauer
maintainerPATCH 1/2 dmaengine: imx-dma: Add device tree probe support
In reply to Alexander ShiyanQuoted 3 lines · Alexander Shiyan
This patch adds device tree probe support for imx-dma driver.
Signed-off-by Alexander Shiyan <[email protected]>
There's already v6 of a series adding devicetree support for imx-dma available:
See http://comments.gmane.org/gmane.linux.drivers.devicetree/34800
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 9 lines · Alexander Shiyan
Quoted 3 lines
This patch adds device tree probe support for imx-dma driver.
Signed-off-by Alexander Shiyan <[email protected]>There's already v6 of a series adding devicetree support for imx-dma available:
See http://comments.gmane.org/gmane.linux.drivers.devicetree/34800
Ah, OK. Then just throw these patches.
---