diff for duplicates of <1374876181.30721.28@snotra> diff --git a/a/1.txt b/N1/1.txt index 956fa0e..d35b63c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,25 +1,25 @@ On 07/26/2013 05:27:15 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 +> +> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this > patch adds > the device tree nodes for them. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- -> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 =20 +> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 > ++++++++++++++++ > arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 4 +- -> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 > ++++++++++++++++++++ -> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 > ++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 5 files changed, 232 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 ->=20 -> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt =20 +> +> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > index ed703d9..c9f81b9 100644 > --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt @@ -27,9 +27,9 @@ On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote: > @@ -130,6 +130,72 @@ Example: > }; > }; ->=20 +> > +** Freescale Elo3 DMA Controller -> + This is EloPlus controller with 8 channels, used in Freescale =20 +> + This is EloPlus controller with 8 channels, used in Freescale > Txxx and Bxxx > + series chips, such as t1040, t4240, b4860. > + @@ -37,9 +37,9 @@ On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote: > + > +- compatible : must include "fsl,elo3-dma" -OK, you fixed it here, but you still have the "fsl,CHIP-dma" language =20 -in the rest of the document. There is no difference between elo3 and =20 -previous chips regarding fsl,CHIP-dma as far as the binding is =20 +OK, you fixed it here, but you still have the "fsl,CHIP-dma" language +in the rest of the document. There is no difference between elo3 and +previous chips regarding fsl,CHIP-dma as far as the binding is concerned. --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index e941f91..7efe537 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,37 +3,37 @@ "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH v6 2/3] DMA: Freescale: Add new 8-channel DMA engine device tree nodes\0" "Date\0Fri, 26 Jul 2013 17:03:01 -0500\0" - "To\0<hongbo.zhang@freescale.com>\0" - "Cc\0devicetree@vger.kernel.org" - vinod.koul@intel.com - linux-kernel@vger.kernel.org - Hongbo Zhang <hongbo.zhang@freescale.com> + "To\0hongbo.zhang@freescale.com\0" + "Cc\0vinod.koul@intel.com" djbw@fb.com - " linuxppc-dev@lists.ozlabs.org\0" + leoli@freescale.com + linuxppc-dev@lists.ozlabs.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote:\n" "> From: Hongbo Zhang <hongbo.zhang@freescale.com>\n" - ">=20\n" - "> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this =20\n" + "> \n" + "> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this \n" "> patch adds\n" "> the device tree nodes for them.\n" - ">=20\n" + "> \n" "> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>\n" "> ---\n" - "> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 =20\n" + "> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 \n" "> ++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 4 +-\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 \n" "> ++++++++++++++++++++\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 \n" "> ++++++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-\n" "> 5 files changed, 232 insertions(+), 4 deletions(-)\n" "> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi\n" "> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi\n" - ">=20\n" - "> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt =20\n" + "> \n" + "> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt \n" "> b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" "> index ed703d9..c9f81b9 100644\n" "> --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" @@ -41,9 +41,9 @@ "> @@ -130,6 +130,72 @@ Example:\n" "> \t\t};\n" "> \t};\n" - ">=20\n" + "> \n" "> +** Freescale Elo3 DMA Controller\n" - "> + This is EloPlus controller with 8 channels, used in Freescale =20\n" + "> + This is EloPlus controller with 8 channels, used in Freescale \n" "> Txxx and Bxxx\n" "> + series chips, such as t1040, t4240, b4860.\n" "> +\n" @@ -51,11 +51,11 @@ "> +\n" "> +- compatible : must include \"fsl,elo3-dma\"\n" "\n" - "OK, you fixed it here, but you still have the \"fsl,CHIP-dma\" language =20\n" - "in the rest of the document. There is no difference between elo3 and =20\n" - "previous chips regarding fsl,CHIP-dma as far as the binding is =20\n" + "OK, you fixed it here, but you still have the \"fsl,CHIP-dma\" language \n" + "in the rest of the document. There is no difference between elo3 and \n" + "previous chips regarding fsl,CHIP-dma as far as the binding is \n" "concerned.\n" "\n" - -Scott= + -Scott -57a00a11a261d067b8bf13ab83dfaec7ec038175b63db371d6efdd1ba95c255e +f8bd60ae019e84e746a62c53400dc6ac33c82daf5a81a8ef20a0844ceee452cd
diff --git a/a/1.txt b/N2/1.txt index 956fa0e..d35b63c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,25 +1,25 @@ On 07/26/2013 05:27:15 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 +> +> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this > patch adds > the device tree nodes for them. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- -> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 =20 +> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 > ++++++++++++++++ > arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 4 +- -> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 > ++++++++++++++++++++ -> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 > ++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 5 files changed, 232 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 ->=20 -> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt =20 +> +> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > index ed703d9..c9f81b9 100644 > --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt @@ -27,9 +27,9 @@ On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote: > @@ -130,6 +130,72 @@ Example: > }; > }; ->=20 +> > +** Freescale Elo3 DMA Controller -> + This is EloPlus controller with 8 channels, used in Freescale =20 +> + This is EloPlus controller with 8 channels, used in Freescale > Txxx and Bxxx > + series chips, such as t1040, t4240, b4860. > + @@ -37,9 +37,9 @@ On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote: > + > +- compatible : must include "fsl,elo3-dma" -OK, you fixed it here, but you still have the "fsl,CHIP-dma" language =20 -in the rest of the document. There is no difference between elo3 and =20 -previous chips regarding fsl,CHIP-dma as far as the binding is =20 +OK, you fixed it here, but you still have the "fsl,CHIP-dma" language +in the rest of the document. There is no difference between elo3 and +previous chips regarding fsl,CHIP-dma as far as the binding is concerned. --Scott= +-Scott diff --git a/a/content_digest b/N2/content_digest index e941f91..d769ce0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,36 +4,37 @@ "Subject\0Re: [PATCH v6 2/3] DMA: Freescale: Add new 8-channel DMA engine device tree nodes\0" "Date\0Fri, 26 Jul 2013 17:03:01 -0500\0" "To\0<hongbo.zhang@freescale.com>\0" - "Cc\0devicetree@vger.kernel.org" - vinod.koul@intel.com - linux-kernel@vger.kernel.org - Hongbo Zhang <hongbo.zhang@freescale.com> - djbw@fb.com - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0<vinod.koul@intel.com>" + <djbw@fb.com> + <leoli@freescale.com> + <linuxppc-dev@lists.ozlabs.org> + <devicetree@vger.kernel.org> + <linux-kernel@vger.kernel.org> + " Hongbo Zhang <hongbo.zhang@freescale.com>\0" "\00:1\0" "b\0" "On 07/26/2013 05:27:15 AM, hongbo.zhang@freescale.com wrote:\n" "> From: Hongbo Zhang <hongbo.zhang@freescale.com>\n" - ">=20\n" - "> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this =20\n" + "> \n" + "> Freescale QorIQ T4 and B4 introduce new 8-channel DMA engines, this \n" "> patch adds\n" "> the device tree nodes for them.\n" - ">=20\n" + "> \n" "> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>\n" "> ---\n" - "> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 =20\n" + "> .../devicetree/bindings/powerpc/fsl/dma.txt | 66 \n" "> ++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 4 +-\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 81 \n" "> ++++++++++++++++++++\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 81 \n" "> ++++++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-\n" "> 5 files changed, 232 insertions(+), 4 deletions(-)\n" "> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi\n" "> create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi\n" - ">=20\n" - "> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt =20\n" + "> \n" + "> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt \n" "> b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" "> index ed703d9..c9f81b9 100644\n" "> --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" @@ -41,9 +42,9 @@ "> @@ -130,6 +130,72 @@ Example:\n" "> \t\t};\n" "> \t};\n" - ">=20\n" + "> \n" "> +** Freescale Elo3 DMA Controller\n" - "> + This is EloPlus controller with 8 channels, used in Freescale =20\n" + "> + This is EloPlus controller with 8 channels, used in Freescale \n" "> Txxx and Bxxx\n" "> + series chips, such as t1040, t4240, b4860.\n" "> +\n" @@ -51,11 +52,11 @@ "> +\n" "> +- compatible : must include \"fsl,elo3-dma\"\n" "\n" - "OK, you fixed it here, but you still have the \"fsl,CHIP-dma\" language =20\n" - "in the rest of the document. There is no difference between elo3 and =20\n" - "previous chips regarding fsl,CHIP-dma as far as the binding is =20\n" + "OK, you fixed it here, but you still have the \"fsl,CHIP-dma\" language \n" + "in the rest of the document. There is no difference between elo3 and \n" + "previous chips regarding fsl,CHIP-dma as far as the binding is \n" "concerned.\n" "\n" - -Scott= + -Scott -57a00a11a261d067b8bf13ab83dfaec7ec038175b63db371d6efdd1ba95c255e +2e36b713537f0c3dbe72927e13c052b47a503fa4f0fafb23ac8e20c2c7614e5d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.