* [PATCH V2 0/2] DMA: Freescale: Add support for 8-channel DMA engine @ 2013-07-05 6:27 hongbo.zhang 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang 2013-07-05 6:27 ` [PATCH V2 2/2] DMA: Freescale: update driver to support 8-channel DMA engine hongbo.zhang 0 siblings, 2 replies; 9+ messages in thread From: hongbo.zhang @ 2013-07-05 6:27 UTC (permalink / raw) To: vinod.koul, djbw, leoli, scottwood, linuxppc-dev Cc: Hongbo Zhang, devicetree-discuss, linux-kernel, vakul From: Hongbo Zhang <hongbo.zhang@freescale.com> Hi Vinod, Dan, Leo and Scott, please have a look at these V2 patches. Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this patch set adds support this DMA engine. V1->v2 changes: - removed the codes handling the register dgsr1, since it isn't used corrently - renamed the DMA DT compatible to "fsl,elo3-dma" - renamed the new dts files to "elo3-dma-<n>.dtsi" Hongbo Zhang (2): DMA: Freescale: Add new 8-channel DMA engine device tree nodes DMA: Freescale: update driver to support 8-channel DMA engine arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 +++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 +++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- drivers/dma/fsldma.c | 5 +- drivers/dma/fsldma.h | 2 +- 5 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi -- 1.7.9.5 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-05 6:27 [PATCH V2 0/2] DMA: Freescale: Add support for 8-channel DMA engine hongbo.zhang @ 2013-07-05 6:27 ` hongbo.zhang 2013-07-09 16:48 ` Scott Wood ` (2 more replies) 2013-07-05 6:27 ` [PATCH V2 2/2] DMA: Freescale: update driver to support 8-channel DMA engine hongbo.zhang 1 sibling, 3 replies; 9+ messages in thread From: hongbo.zhang @ 2013-07-05 6:27 UTC (permalink / raw) To: vinod.koul, djbw, leoli, scottwood, linuxppc-dev Cc: Hongbo Zhang, devicetree-discuss, linux-kernel, vakul From: Hongbo Zhang <hongbo.zhang@freescale.com> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this patch add the device tree nodes for them. Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> --- arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 +++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 +++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- 3 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi diff --git a/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi b/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi new file mode 100644 index 0000000..50cd911 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi @@ -0,0 +1,90 @@ +/* + * QorIQ DMA device tree stub [ controller @ offset 0x100000 ] + * + * Copyright 2011-2013 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +dma0: dma@100300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,elo3-dma"; + reg = <0x100300 0x4 0x100600 0x4>; + ranges = <0x0 0x100100 0x500>; + cell-index = <0>; + dma-channel@0 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x0 0x80>; + cell-index = <0>; + interrupts = <28 2 0 0>; + }; + dma-channel@80 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x80 0x80>; + cell-index = <1>; + interrupts = <29 2 0 0>; + }; + dma-channel@100 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x100 0x80>; + cell-index = <2>; + interrupts = <30 2 0 0>; + }; + dma-channel@180 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x180 0x80>; + cell-index = <3>; + interrupts = <31 2 0 0>; + }; + dma-channel@300 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x300 0x80>; + cell-index = <4>; + interrupts = <76 2 0 0>; + }; + dma-channel@380 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x380 0x80>; + cell-index = <5>; + interrupts = <77 2 0 0>; + }; + dma-channel@400 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x400 0x80>; + cell-index = <6>; + interrupts = <78 2 0 0>; + }; + dma-channel@480 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x480 0x80>; + cell-index = <7>; + interrupts = <79 2 0 0>; + }; +}; diff --git a/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi b/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi new file mode 100644 index 0000000..c1aec68 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi @@ -0,0 +1,90 @@ +/* + * QorIQ DMA device tree stub [ controller @ offset 0x101000 ] + * + * Copyright 2011-2013 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +dma1: dma@101300 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,elo3-dma"; + reg = <0x101300 0x4 0x101600 0x4>; + ranges = <0x0 0x101100 0x500>; + cell-index = <1>; + dma-channel@0 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x0 0x80>; + cell-index = <0>; + interrupts = <32 2 0 0>; + }; + dma-channel@80 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x80 0x80>; + cell-index = <1>; + interrupts = <33 2 0 0>; + }; + dma-channel@100 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x100 0x80>; + cell-index = <2>; + interrupts = <34 2 0 0>; + }; + dma-channel@180 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x180 0x80>; + cell-index = <3>; + interrupts = <35 2 0 0>; + }; + dma-channel@300 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x300 0x80>; + cell-index = <4>; + interrupts = <80 2 0 0>; + }; + dma-channel@380 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x380 0x80>; + cell-index = <5>; + interrupts = <81 2 0 0>; + }; + dma-channel@400 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x400 0x80>; + cell-index = <6>; + interrupts = <82 2 0 0>; + }; + dma-channel@480 { + compatible = "fsl,eloplus-dma-channel"; + reg = <0x480 0x80>; + cell-index = <7>; + interrupts = <83 2 0 0>; + }; +}; diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index bd611a9..ec95c60 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi @@ -387,8 +387,8 @@ reg = <0xea000 0x4000>; }; -/include/ "qoriq-dma-0.dtsi" -/include/ "qoriq-dma-1.dtsi" +/include/ "elo3-dma-0.dtsi" +/include/ "elo3-dma-1.dtsi" /include/ "qoriq-espi-0.dtsi" spi@110000 { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang @ 2013-07-09 16:48 ` Scott Wood 2013-07-12 5:33 ` Hongbo Zhang 2013-07-15 13:31 ` Kumar Gala 2013-07-15 13:35 ` Kumar Gala 2 siblings, 1 reply; 9+ messages in thread From: Scott Wood @ 2013-07-09 16:48 UTC (permalink / raw) To: hongbo.zhang Cc: vinod.koul, devicetree-discuss, linux-kernel, vakul, Hongbo Zhang, djbw, linuxppc-dev On 07/05/2013 01:27:05 AM, hongbo.zhang@freescale.com wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> >=20 > Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this =20 > patch add > the device tree nodes for them. >=20 > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 =20 > +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 =20 > +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 3 files changed, 182 insertions(+), 2 deletions(-) > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi Please update Documentation/devicetree/bindings/powerpc/fsl/dma.txt for =20 the new compatible and dgsr1. -Scott= ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-09 16:48 ` Scott Wood @ 2013-07-12 5:33 ` Hongbo Zhang 0 siblings, 0 replies; 9+ messages in thread From: Hongbo Zhang @ 2013-07-12 5:33 UTC (permalink / raw) To: Scott Wood Cc: vinod.koul, devicetree-discuss, linux-kernel, vakul, djbw, linuxppc-dev On 07/10/2013 12:48 AM, Scott Wood wrote: > On 07/05/2013 01:27:05 AM, hongbo.zhang@freescale.com wrote: >> From: Hongbo Zhang <hongbo.zhang@freescale.com> >> >> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this >> patch add >> the device tree nodes for them. >> >> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> >> --- >> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 >> +++++++++++++++++++++++++++ >> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 >> +++++++++++++++++++++++++++ >> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- >> 3 files changed, 182 insertions(+), 2 deletions(-) >> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi >> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi > > Please update Documentation/devicetree/bindings/powerpc/fsl/dma.txt > for the new compatible and dgsr1. OK, thanks. What's more, some text string in the driver and Kconfig files should be updated too, e.g. "Elo / Elo Plus DMA" may be changed to "Elo series DMA", will send out v3 patches soon. > > -Scott ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang 2013-07-09 16:48 ` Scott Wood @ 2013-07-15 13:31 ` Kumar Gala 2013-07-17 7:09 ` Hongbo Zhang 2013-07-15 13:35 ` Kumar Gala 2 siblings, 1 reply; 9+ messages in thread From: Kumar Gala @ 2013-07-15 13:31 UTC (permalink / raw) To: <hongbo.zhang@freescale.com> Cc: vinod.koul, devicetree-discuss, linux-kernel, vakul, djbw, scottwood, linuxppc-dev On Jul 5, 2013, at 1:27 AM, <hongbo.zhang@freescale.com> = <hongbo.zhang@freescale.com> wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> >=20 > Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this = patch add > the device tree nodes for them. >=20 > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 = +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 = +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 3 files changed, 182 insertions(+), 2 deletions(-) > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi Why didn't you update b4si-post.dtsi as well? - k= ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-15 13:31 ` Kumar Gala @ 2013-07-17 7:09 ` Hongbo Zhang 0 siblings, 0 replies; 9+ messages in thread From: Hongbo Zhang @ 2013-07-17 7:09 UTC (permalink / raw) To: Kumar Gala Cc: vinod.koul, devicetree-discuss, linux-kernel, vakul, djbw, scottwood, linuxppc-dev On 07/15/2013 09:31 PM, Kumar Gala wrote: > On Jul 5, 2013, at 1:27 AM, <hongbo.zhang@freescale.com> <hongbo.zhang@freescale.com> wrote: > >> From: Hongbo Zhang <hongbo.zhang@freescale.com> >> >> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this patch add >> the device tree nodes for them. >> >> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> >> --- >> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 +++++++++++++++++++++++++++ >> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 +++++++++++++++++++++++++++ >> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- >> 3 files changed, 182 insertions(+), 2 deletions(-) >> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi >> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi > Why didn't you update b4si-post.dtsi as well? OK, will update it too, thanks. > > - k ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang 2013-07-09 16:48 ` Scott Wood 2013-07-15 13:31 ` Kumar Gala @ 2013-07-15 13:35 ` Kumar Gala 2013-07-15 17:12 ` Scott Wood 2 siblings, 1 reply; 9+ messages in thread From: Kumar Gala @ 2013-07-15 13:35 UTC (permalink / raw) To: <hongbo.zhang@freescale.com> Cc: vinod.koul, devicetree-discuss, linux-kernel, vakul, djbw, scottwood, linuxppc-dev On Jul 5, 2013, at 1:27 AM, <hongbo.zhang@freescale.com> = <hongbo.zhang@freescale.com> wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> >=20 > Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this = patch add > the device tree nodes for them. >=20 > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 = +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 = +++++++++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 3 files changed, 182 insertions(+), 2 deletions(-) > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi > create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi >=20 > diff --git a/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi = b/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi > new file mode 100644 > index 0000000..50cd911 > --- /dev/null > +++ b/arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi > @@ -0,0 +1,90 @@ > +/* > + * QorIQ DMA device tree stub [ controller @ offset 0x100000 ] > + * > + * Copyright 2011-2013 Freescale Semiconductor Inc. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions = are met: > + * * Redistributions of source code must retain the above = copyright > + * notice, this list of conditions and the following = disclaimer. > + * * Redistributions in binary form must reproduce the above = copyright > + * notice, this list of conditions and the following disclaimer = in the > + * documentation and/or other materials provided with the = distribution. > + * * Neither the name of Freescale Semiconductor nor the > + * names of its contributors may be used to endorse or promote = products > + * derived from this software without specific prior written = permission. > + * > + * > + * ALTERNATIVELY, this software may be distributed under the terms of = the > + * GNU General Public License ("GPL") as published by the Free = Software > + * Foundation, either version 2 of that License or (at your option) = any > + * later version. > + * > + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND = ANY > + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE = IMPLIED > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE = ARE > + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE = FOR ANY > + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL = DAMAGES > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR = SERVICES; > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER = CAUSED AND > + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, = OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE = USE OF THIS > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +dma0: dma@100300 { > + #address-cells =3D <1>; > + #size-cells =3D <1>; > + compatible =3D "fsl,elo3-dma"; why does this require a new compatible? > + reg =3D <0x100300 0x4 0x100600 0x4>; > + ranges =3D <0x0 0x100100 0x500>; > + cell-index =3D <0>; > + dma-channel@0 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x0 0x80>; > + cell-index =3D <0>; > + interrupts =3D <28 2 0 0>; > + }; > + dma-channel@80 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x80 0x80>; > + cell-index =3D <1>; > + interrupts =3D <29 2 0 0>; > + }; > + dma-channel@100 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x100 0x80>; > + cell-index =3D <2>; > + interrupts =3D <30 2 0 0>; > + }; > + dma-channel@180 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x180 0x80>; > + cell-index =3D <3>; > + interrupts =3D <31 2 0 0>; > + }; > + dma-channel@300 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x300 0x80>; > + cell-index =3D <4>; > + interrupts =3D <76 2 0 0>; > + }; > + dma-channel@380 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x380 0x80>; > + cell-index =3D <5>; > + interrupts =3D <77 2 0 0>; > + }; > + dma-channel@400 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x400 0x80>; > + cell-index =3D <6>; > + interrupts =3D <78 2 0 0>; > + }; > + dma-channel@480 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x480 0x80>; > + cell-index =3D <7>; > + interrupts =3D <79 2 0 0>; > + }; > +}; > diff --git a/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi = b/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi > new file mode 100644 > index 0000000..c1aec68 > --- /dev/null > +++ b/arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi > @@ -0,0 +1,90 @@ > +/* > + * QorIQ DMA device tree stub [ controller @ offset 0x101000 ] > + * > + * Copyright 2011-2013 Freescale Semiconductor Inc. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions = are met: > + * * Redistributions of source code must retain the above = copyright > + * notice, this list of conditions and the following = disclaimer. > + * * Redistributions in binary form must reproduce the above = copyright > + * notice, this list of conditions and the following disclaimer = in the > + * documentation and/or other materials provided with the = distribution. > + * * Neither the name of Freescale Semiconductor nor the > + * names of its contributors may be used to endorse or promote = products > + * derived from this software without specific prior written = permission. > + * > + * > + * ALTERNATIVELY, this software may be distributed under the terms of = the > + * GNU General Public License ("GPL") as published by the Free = Software > + * Foundation, either version 2 of that License or (at your option) = any > + * later version. > + * > + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND = ANY > + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE = IMPLIED > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE = ARE > + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE = FOR ANY > + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL = DAMAGES > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR = SERVICES; > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER = CAUSED AND > + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, = OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE = USE OF THIS > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +dma1: dma@101300 { > + #address-cells =3D <1>; > + #size-cells =3D <1>; > + compatible =3D "fsl,elo3-dma"; > + reg =3D <0x101300 0x4 0x101600 0x4>; > + ranges =3D <0x0 0x101100 0x500>; > + cell-index =3D <1>; > + dma-channel@0 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x0 0x80>; > + cell-index =3D <0>; > + interrupts =3D <32 2 0 0>; > + }; > + dma-channel@80 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x80 0x80>; > + cell-index =3D <1>; > + interrupts =3D <33 2 0 0>; > + }; > + dma-channel@100 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x100 0x80>; > + cell-index =3D <2>; > + interrupts =3D <34 2 0 0>; > + }; > + dma-channel@180 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x180 0x80>; > + cell-index =3D <3>; > + interrupts =3D <35 2 0 0>; > + }; > + dma-channel@300 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x300 0x80>; > + cell-index =3D <4>; > + interrupts =3D <80 2 0 0>; > + }; > + dma-channel@380 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x380 0x80>; > + cell-index =3D <5>; > + interrupts =3D <81 2 0 0>; > + }; > + dma-channel@400 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x400 0x80>; > + cell-index =3D <6>; > + interrupts =3D <82 2 0 0>; > + }; > + dma-channel@480 { > + compatible =3D "fsl,eloplus-dma-channel"; > + reg =3D <0x480 0x80>; > + cell-index =3D <7>; > + interrupts =3D <83 2 0 0>; > + }; > +}; > diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi = b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi > index bd611a9..ec95c60 100644 > --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi > +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi > @@ -387,8 +387,8 @@ > reg =3D <0xea000 0x4000>; > }; >=20 > -/include/ "qoriq-dma-0.dtsi" > -/include/ "qoriq-dma-1.dtsi" > +/include/ "elo3-dma-0.dtsi" > +/include/ "elo3-dma-1.dtsi" >=20 > /include/ "qoriq-espi-0.dtsi" > spi@110000 { > --=20 > 1.7.9.5 >=20 >=20 >=20 > -- > To unsubscribe from this list: send the line "unsubscribe = linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes 2013-07-15 13:35 ` Kumar Gala @ 2013-07-15 17:12 ` Scott Wood 0 siblings, 0 replies; 9+ messages in thread From: Scott Wood @ 2013-07-15 17:12 UTC (permalink / raw) To: Kumar Gala Cc: <hongbo.zhang@freescale.com>, devicetree-discuss, linux-kernel, vakul, vinod.koul, djbw, linuxppc-dev On 07/15/2013 08:35:07 AM, Kumar Gala wrote: >=20 > On Jul 5, 2013, at 1:27 AM, <hongbo.zhang@freescale.com> =20 > <hongbo.zhang@freescale.com> wrote: >=20 > > +dma0: dma@100300 { > > + #address-cells =3D <1>; > > + #size-cells =3D <1>; > > + compatible =3D "fsl,elo3-dma"; >=20 > why does this require a new compatible? The binding has changed -- there is now a second reg entry. -Scott= ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V2 2/2] DMA: Freescale: update driver to support 8-channel DMA engine 2013-07-05 6:27 [PATCH V2 0/2] DMA: Freescale: Add support for 8-channel DMA engine hongbo.zhang 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang @ 2013-07-05 6:27 ` hongbo.zhang 1 sibling, 0 replies; 9+ messages in thread From: hongbo.zhang @ 2013-07-05 6:27 UTC (permalink / raw) To: vinod.koul, djbw, leoli, scottwood, linuxppc-dev Cc: Hongbo Zhang, devicetree-discuss, linux-kernel, vakul From: Hongbo Zhang <hongbo.zhang@freescale.com> This patch adds support to 8-channel DMA engine, thus the driver works for both the new 8-channel and the legacy 4-channel DMA engines. Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> --- drivers/dma/fsldma.c | 5 ++++- drivers/dma/fsldma.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 4fc2980..7732de2 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -1261,7 +1261,9 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, WARN_ON(fdev->feature != chan->feature); chan->dev = fdev->dev; - chan->id = ((res.start - 0x100) & 0xfff) >> 7; + chan->id = (res.start & 0xfff) < 0x300 ? + ((res.start - 0x100) & 0xfff) >> 7 : + ((res.start - 0x200) & 0xfff) >> 7; if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) { dev_err(fdev->dev, "too many channels for device\n"); err = -EINVAL; @@ -1435,6 +1437,7 @@ static int fsldma_of_remove(struct platform_device *op) } static const struct of_device_id fsldma_of_ids[] = { + { .compatible = "fsl,elo3-dma", }, { .compatible = "fsl,eloplus-dma", }, { .compatible = "fsl,elo-dma", }, {} diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h index f5c3879..1ffc244 100644 --- a/drivers/dma/fsldma.h +++ b/drivers/dma/fsldma.h @@ -112,7 +112,7 @@ struct fsldma_chan_regs { }; struct fsldma_chan; -#define FSL_DMA_MAX_CHANS_PER_DEVICE 4 +#define FSL_DMA_MAX_CHANS_PER_DEVICE 8 struct fsldma_device { void __iomem *regs; /* DGSR register base */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-07-17 7:09 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-05 6:27 [PATCH V2 0/2] DMA: Freescale: Add support for 8-channel DMA engine hongbo.zhang 2013-07-05 6:27 ` [PATCH V2 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang 2013-07-09 16:48 ` Scott Wood 2013-07-12 5:33 ` Hongbo Zhang 2013-07-15 13:31 ` Kumar Gala 2013-07-17 7:09 ` Hongbo Zhang 2013-07-15 13:35 ` Kumar Gala 2013-07-15 17:12 ` Scott Wood 2013-07-05 6:27 ` [PATCH V2 2/2] DMA: Freescale: update driver to support 8-channel DMA engine hongbo.zhang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).