diff for duplicates of <1373911025.8183.308@snotra> diff --git a/a/1.txt b/N1/1.txt index b18ea9f..7dfc222 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,32 +1,32 @@ On 07/15/2013 05:34:58 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 add > the device tree nodes for them. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > .../devicetree/bindings/powerpc/fsl/dma.txt | 8 +- -> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 > ++++++++++++++++++++ -> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 > ++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 4 files changed, 187 insertions(+), 5 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 2a4b4bc..8ee5732 100644 > --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > +++ b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt -> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general =20 +> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general > purpose DMA controllers. ->=20 +> > Required properties: ->=20 +> > -- compatible : compatible list, contains 2 entries, first is > +- compatible : compatible list, contains 3 entries, first is > "fsl,CHIP-dma", where CHIP is the processor @@ -34,8 +34,8 @@ On 07/15/2013 05:34:58 AM, hongbo.zhang@freescale.com wrote: > - "fsl,eloplus-dma" > + "fsl,eloplus-dma", the third is "fsl,elo3-dma" -The new device tree nodes have only one compatible in the list, not =20 -three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the =20 +The new device tree nodes have only one compatible in the list, not +three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the same node, fsl,elo3-dma should come first. > - reg : <registers mapping for DMA general status reg> @@ -43,13 +43,13 @@ same node, fsl,elo3-dma should come first. > 1 for controller @ 0xc000 > @@ -100,7 +100,7 @@ Example: > dma@21300 { -> #address-cells =3D <1>; -> #size-cells =3D <1>; -> - compatible =3D "fsl,mpc8540-dma", "fsl,eloplus-dma"; -> + compatible =3D "fsl,mpc8540-dma", "fsl,eloplus-dma", =20 +> #address-cells = <1>; +> #size-cells = <1>; +> - compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma"; +> + compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma", > "fsl,elo3-dma"; -In addition to the above issue about ordering, mpc8540 does not have =20 +In addition to the above issue about ordering, mpc8540 does not have elo3. --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index e1f46e9..987fa02 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,45 +3,45 @@ "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH v3 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes\0" "Date\0Mon, 15 Jul 2013 12:57:05 -0500\0" - "To\0<hongbo.zhang@freescale.com>\0" "Cc\0vinod.koul@intel.com" + djbw@fb.com + leoli@freescale.com + linuxppc-dev@lists.ozlabs.org devicetree-discuss@lists.ozlabs.org linux-kernel@vger.kernel.org vakul@freescale.com - Hongbo Zhang <hongbo.zhang@freescale.com> - djbw@fb.com - " linuxppc-dev@lists.ozlabs.org\0" + " Hongbo Zhang <hongbo.zhang@freescale.com>\0" "\00:1\0" "b\0" "On 07/15/2013 05:34:58 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 add\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 | 8 +-\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 \n" "> ++++++++++++++++++++\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 \n" "> ++++++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-\n" "> 4 files changed, 187 insertions(+), 5 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 2a4b4bc..8ee5732 100644\n" "> --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" "> +++ b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" - "> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general =20\n" + "> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general \n" "> purpose DMA controllers.\n" - ">=20\n" + "> \n" "> Required properties:\n" - ">=20\n" + "> \n" "> -- compatible : compatible list, contains 2 entries, first is\n" "> +- compatible : compatible list, contains 3 entries, first is\n" "> \t\t \"fsl,CHIP-dma\", where CHIP is the processor\n" @@ -49,8 +49,8 @@ "> -\t\t \"fsl,eloplus-dma\"\n" "> +\t\t \"fsl,eloplus-dma\", the third is \"fsl,elo3-dma\"\n" "\n" - "The new device tree nodes have only one compatible in the list, not =20\n" - "three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the =20\n" + "The new device tree nodes have only one compatible in the list, not \n" + "three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the \n" "same node, fsl,elo3-dma should come first.\n" "\n" "> - reg : <registers mapping for DMA general status reg>\n" @@ -58,15 +58,15 @@ "> 1 for controller @ 0xc000\n" "> @@ -100,7 +100,7 @@ Example:\n" "> \tdma@21300 {\n" - "> \t\t#address-cells =3D <1>;\n" - "> \t\t#size-cells =3D <1>;\n" - "> -\t\tcompatible =3D \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\";\n" - "> +\t\tcompatible =3D \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\", =20\n" + "> \t\t#address-cells = <1>;\n" + "> \t\t#size-cells = <1>;\n" + "> -\t\tcompatible = \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\";\n" + "> +\t\tcompatible = \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\", \n" "> \"fsl,elo3-dma\";\n" "\n" - "In addition to the above issue about ordering, mpc8540 does not have =20\n" + "In addition to the above issue about ordering, mpc8540 does not have \n" "elo3.\n" "\n" - -Scott= + -Scott -0c8bc8f67ffd72c46d623d4d7c489a50efeddc45ad4aea8feed78be473715737 +d26c0c5c0128cd2bbba675490a911f825a4ebf6652340d2cc25d048982fbc210
diff --git a/a/1.txt b/N2/1.txt index b18ea9f..7dfc222 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,32 +1,32 @@ On 07/15/2013 05:34:58 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 add > the device tree nodes for them. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > .../devicetree/bindings/powerpc/fsl/dma.txt | 8 +- -> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 > ++++++++++++++++++++ -> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 =20 +> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 > ++++++++++++++++++++ > arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- > 4 files changed, 187 insertions(+), 5 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 2a4b4bc..8ee5732 100644 > --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt > +++ b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt -> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general =20 +> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general > purpose DMA controllers. ->=20 +> > Required properties: ->=20 +> > -- compatible : compatible list, contains 2 entries, first is > +- compatible : compatible list, contains 3 entries, first is > "fsl,CHIP-dma", where CHIP is the processor @@ -34,8 +34,8 @@ On 07/15/2013 05:34:58 AM, hongbo.zhang@freescale.com wrote: > - "fsl,eloplus-dma" > + "fsl,eloplus-dma", the third is "fsl,elo3-dma" -The new device tree nodes have only one compatible in the list, not =20 -three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the =20 +The new device tree nodes have only one compatible in the list, not +three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the same node, fsl,elo3-dma should come first. > - reg : <registers mapping for DMA general status reg> @@ -43,13 +43,13 @@ same node, fsl,elo3-dma should come first. > 1 for controller @ 0xc000 > @@ -100,7 +100,7 @@ Example: > dma@21300 { -> #address-cells =3D <1>; -> #size-cells =3D <1>; -> - compatible =3D "fsl,mpc8540-dma", "fsl,eloplus-dma"; -> + compatible =3D "fsl,mpc8540-dma", "fsl,eloplus-dma", =20 +> #address-cells = <1>; +> #size-cells = <1>; +> - compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma"; +> + compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma", > "fsl,elo3-dma"; -In addition to the above issue about ordering, mpc8540 does not have =20 +In addition to the above issue about ordering, mpc8540 does not have elo3. --Scott= +-Scott diff --git a/a/content_digest b/N2/content_digest index e1f46e9..ddb9469 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,44 +4,45 @@ "Subject\0Re: [PATCH v3 1/2] DMA: Freescale: Add new 8-channel DMA engine device tree nodes\0" "Date\0Mon, 15 Jul 2013 12:57:05 -0500\0" "To\0<hongbo.zhang@freescale.com>\0" - "Cc\0vinod.koul@intel.com" - devicetree-discuss@lists.ozlabs.org - linux-kernel@vger.kernel.org - vakul@freescale.com - 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-discuss@lists.ozlabs.org> + <linux-kernel@vger.kernel.org> + <vakul@freescale.com> + " Hongbo Zhang <hongbo.zhang@freescale.com>\0" "\00:1\0" "b\0" "On 07/15/2013 05:34:58 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 add\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 | 8 +-\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi | 90 \n" "> ++++++++++++++++++++\n" - "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 =20\n" + "> arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi | 90 \n" "> ++++++++++++++++++++\n" "> arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +-\n" "> 4 files changed, 187 insertions(+), 5 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 2a4b4bc..8ee5732 100644\n" "> --- a/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" "> +++ b/Documentation/devicetree/bindings/powerpc/fsl/dma.txt\n" - "> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general =20\n" + "> @@ -76,10 +76,10 @@ Freescale PowerPC 85xx/86xx have on chip general \n" "> purpose DMA controllers.\n" - ">=20\n" + "> \n" "> Required properties:\n" - ">=20\n" + "> \n" "> -- compatible : compatible list, contains 2 entries, first is\n" "> +- compatible : compatible list, contains 3 entries, first is\n" "> \t\t \"fsl,CHIP-dma\", where CHIP is the processor\n" @@ -49,8 +50,8 @@ "> -\t\t \"fsl,eloplus-dma\"\n" "> +\t\t \"fsl,eloplus-dma\", the third is \"fsl,elo3-dma\"\n" "\n" - "The new device tree nodes have only one compatible in the list, not =20\n" - "three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the =20\n" + "The new device tree nodes have only one compatible in the list, not \n" + "three. And if you were to both fsl,eloplus-dma and fsl,elo3-dma on the \n" "same node, fsl,elo3-dma should come first.\n" "\n" "> - reg : <registers mapping for DMA general status reg>\n" @@ -58,15 +59,15 @@ "> 1 for controller @ 0xc000\n" "> @@ -100,7 +100,7 @@ Example:\n" "> \tdma@21300 {\n" - "> \t\t#address-cells =3D <1>;\n" - "> \t\t#size-cells =3D <1>;\n" - "> -\t\tcompatible =3D \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\";\n" - "> +\t\tcompatible =3D \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\", =20\n" + "> \t\t#address-cells = <1>;\n" + "> \t\t#size-cells = <1>;\n" + "> -\t\tcompatible = \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\";\n" + "> +\t\tcompatible = \"fsl,mpc8540-dma\", \"fsl,eloplus-dma\", \n" "> \"fsl,elo3-dma\";\n" "\n" - "In addition to the above issue about ordering, mpc8540 does not have =20\n" + "In addition to the above issue about ordering, mpc8540 does not have \n" "elo3.\n" "\n" - -Scott= + -Scott -0c8bc8f67ffd72c46d623d4d7c489a50efeddc45ad4aea8feed78be473715737 +c8582f5f18c75df597533548ad1ce6ea763733b0383b63b11dd2a345b7524bb8
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.