| Message ID | 1382022155-21954-3-git-send-email-denis@eukrea.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 17, 2013 at 05:02:00PM +0200, Denis Carikli wrote: > Cc: Rob Herring <rob.herring@calxeda.com> > Cc: Pawel Moll <pawel.moll@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Stephen Warren <swarren@wwwdotorg.org> > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> > Cc: devicetree@vger.kernel.org > Cc: Vinod Koul <vinod.koul@intel.com> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Sascha Hauer <kernel@pengutronix.de> > Cc: linux-arm-kernel@lists.infradead.org > Cc: Eric Bénard <eric@eukrea.com> > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../devicetree/bindings/dma/fsl-imx-ipu.txt | 53 ++++++++++++++++++++ > drivers/dma/ipu/ipu_idmac.c | 8 +++ > 2 files changed, 61 insertions(+) > create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt > > diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt b/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt > new file mode 100644 > index 0000000..a901c33 > --- /dev/null > +++ b/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt > @@ -0,0 +1,53 @@ > +* Freescale Image Processing Unit DMA support for i.MX3x. > + > +This document will only describe differences to the generic DMA Controller and > +DMA request bindings as described in dma/dma.txt . > + > +This dma driver supports the imx31 and imx35 devices. > + > +* DMA controller > + > +Required properties: > +- compatible : Should be "fsl,imx31-ipu". > +- reg : Should contain DMA registers location and length > +- interrupts : First item should be DMA interrupt, second one is optional and > + should contain DMA Error interrupt. > +- #dma-cells : Has to be 1. The ipu driver does not support anything else. > + > +Optional properties: > +- dma-channels : Number of DMA channels supported. Should be 32. > +- #dma-requests : Number of DMA requests supported. > + > +Example: > + > + ipu: ipu@53fc0000 { > + compatible = "fsl,imx31-ipu"; > + reg = < 0x53fc0000 0x5f > + 0x53fc0088 0x2b >; > + interrupts = <42 41>; > + dma-channels = <32>; > + #dma-cells = <1>; > + clocks = <&clks 55>; > + clock-names = ""; > + status = "disabled"; > + }; We already have a binding for the IPUv3. We shouldn't introduce a completely different binding for the IPUv1. We shouldn't expose the dma channels to dt and the lcdc should either be not exported to dt or be a subnode of the ipu node. The above binding is very close to what Linux has implemented, but not so close to the hardware. Sascha
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt b/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt new file mode 100644 index 0000000..a901c33 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt @@ -0,0 +1,53 @@ +* Freescale Image Processing Unit DMA support for i.MX3x. + +This document will only describe differences to the generic DMA Controller and +DMA request bindings as described in dma/dma.txt . + +This dma driver supports the imx31 and imx35 devices. + +* DMA controller + +Required properties: +- compatible : Should be "fsl,imx31-ipu". +- reg : Should contain DMA registers location and length +- interrupts : First item should be DMA interrupt, second one is optional and + should contain DMA Error interrupt. +- #dma-cells : Has to be 1. The ipu driver does not support anything else. + +Optional properties: +- dma-channels : Number of DMA channels supported. Should be 32. +- #dma-requests : Number of DMA requests supported. + +Example: + + ipu: ipu@53fc0000 { + compatible = "fsl,imx31-ipu"; + reg = < 0x53fc0000 0x5f + 0x53fc0088 0x2b >; + interrupts = <42 41>; + dma-channels = <32>; + #dma-cells = <1>; + clocks = <&clks 55>; + clock-names = ""; + status = "disabled"; + }; + +* DMA client + +Clients have to specify the DMA requests with phandles in a list. + +Required properties: +- dmas: List of one or more DMA request specifiers. One DMA request specifier + consists of a phandle to the DMA controller followed by the integer + specifying the request line. +- dma-names: List of string identifiers for the DMA requests. For the correct + names, have a look at the specific client driver. + +Example: + + lcdc: mx3fb@53fc00b4 { + ... + dmas = <&ipu 14>; + dma-names = "tx"; + ... + }; diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index cb9c0bc..d853ee1 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c @@ -22,6 +22,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/dma/ipu-dma.h> #include "../dmaengine.h" @@ -1768,6 +1769,12 @@ static int ipu_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ipu_dma_of_dev_id[] = { + { .compatible = "fsl,imx31-ipu", }, + { /* Sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ipu_dma_of_dev_id); + /* * We need two MEM resources - with IPU-common and Image Converter registers, * including PF_CONF and IDMAC_* registers, and two IRQs - function and error @@ -1775,6 +1782,7 @@ static int ipu_remove(struct platform_device *pdev) static struct platform_driver ipu_platform_driver = { .driver = { .name = "ipu-core", + .of_match_table = of_match_ptr(ipu_dma_of_dev_id), .owner = THIS_MODULE, }, .remove = ipu_remove,
Cc: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: devicetree@vger.kernel.org Cc: Vinod Koul <vinod.koul@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org Cc: Eric Bénard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../devicetree/bindings/dma/fsl-imx-ipu.txt | 53 ++++++++++++++++++++ drivers/dma/ipu/ipu_idmac.c | 8 +++ 2 files changed, 61 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-ipu.txt