diff for duplicates of <5797944.ZQS01RaBIT@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 25479d7..e06e290 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi dma-channels = <15>; }; + -+ scifa0: serial@e6c40000 { ++ scifa0: serial at e6c40000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c40000 0 0x40>; @@ -54,7 +54,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifa1: serial@e6c50000 { ++ scifa1: serial at e6c50000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c50000 0 0x40>; @@ -68,7 +68,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifa2: serial@e6c60000 { ++ scifa2: serial at e6c60000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c60000 0 0x40>; @@ -82,7 +82,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifa3: serial@e6c70000 { ++ scifa3: serial at e6c70000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c70000 0 0x40>; @@ -96,7 +96,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifa4: serial@e6c78000 { ++ scifa4: serial at e6c78000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c78000 0 0x40>; @@ -110,7 +110,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifa5: serial@e6c80000 { ++ scifa5: serial at e6c80000 { + compatible = "renesas,scifa-r8a7743", + "renesas,rcar-gen2-scifa", "renesas,scifa"; + reg = <0 0xe6c80000 0 0x40>; @@ -124,7 +124,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifb0: serial@e6c20000 { ++ scifb0: serial at e6c20000 { + compatible = "renesas,scifb-r8a7743", + "renesas,rcar-gen2-scifb", "renesas,scifb"; + reg = <0 0xe6c20000 0 0x100>; @@ -138,7 +138,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifb1: serial@e6c30000 { ++ scifb1: serial at e6c30000 { + compatible = "renesas,scifb-r8a7743", + "renesas,rcar-gen2-scifb", "renesas,scifb"; + reg = <0 0xe6c30000 0 0x100>; @@ -152,7 +152,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scifb2: serial@e6ce0000 { ++ scifb2: serial at e6ce0000 { + compatible = "renesas,scifb-r8a7743", + "renesas,rcar-gen2-scifb", "renesas,scifb"; + reg = <0 0xe6ce0000 0 0x100>; @@ -166,7 +166,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif0: serial@e6e60000 { ++ scif0: serial at e6e60000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6e60000 0 0x40>; @@ -181,7 +181,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif1: serial@e6e68000 { ++ scif1: serial at e6e68000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6e68000 0 0x40>; @@ -196,7 +196,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif2: serial@e6e58000 { ++ scif2: serial at e6e58000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6e58000 0 0x40>; @@ -211,7 +211,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif3: serial@e6ea8000 { ++ scif3: serial at e6ea8000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6ea8000 0 0x40>; @@ -226,7 +226,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif4: serial@e6ee0000 { ++ scif4: serial at e6ee0000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6ee0000 0 0x40>; @@ -241,7 +241,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ scif5: serial@e6ee8000 { ++ scif5: serial at e6ee8000 { + compatible = "renesas,scif-r8a7743", + "renesas,rcar-gen2-scif", "renesas,scif"; + reg = <0 0xe6ee8000 0 0x40>; @@ -256,7 +256,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ hscif0: serial@e62c0000 { ++ hscif0: serial at e62c0000 { + compatible = "renesas,hscif-r8a7743", + "renesas,rcar-gen2-hscif", "renesas,hscif"; + reg = <0 0xe62c0000 0 0x60>; @@ -271,7 +271,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ hscif1: serial@e62c8000 { ++ hscif1: serial at e62c8000 { + compatible = "renesas,hscif-r8a7743", + "renesas,rcar-gen2-hscif", "renesas,hscif"; + reg = <0 0xe62c8000 0 0x60>; @@ -286,7 +286,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + status = "disabled"; + }; + -+ hscif2: serial@e62d0000 { ++ hscif2: serial at e62d0000 { + compatible = "renesas,hscif-r8a7743", + "renesas,rcar-gen2-hscif", "renesas,hscif"; + reg = <0 0xe62d0000 0 0x60>; diff --git a/a/content_digest b/N1/content_digest index 64f5b2b..ccfb17c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01580369.yToZzJza1l@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH v5 3/7] ARM: dts: r8a7743: add [H]SCIF{A|B} support\0" "Date\0Fri, 28 Oct 2016 00:37:54 +0300\0" - "To\0horms@verge.net.au" - linux-renesas-soc@vger.kernel.org - robh+dt@kernel.org - mark.rutland@arm.com - " devicetree@vger.kernel.org\0" - "Cc\0magnus.damm@gmail.com" - linux@arm.linux.org.uk - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Describe [H]SCIF{|A|B} ports in the R8A7743 device tree.\n" @@ -54,7 +47,7 @@ " \t\t\tdma-channels = <15>;\n" " \t\t};\n" "+\n" - "+\t\tscifa0: serial@e6c40000 {\n" + "+\t\tscifa0: serial at e6c40000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c40000 0 0x40>;\n" @@ -68,7 +61,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifa1: serial@e6c50000 {\n" + "+\t\tscifa1: serial at e6c50000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c50000 0 0x40>;\n" @@ -82,7 +75,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifa2: serial@e6c60000 {\n" + "+\t\tscifa2: serial at e6c60000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c60000 0 0x40>;\n" @@ -96,7 +89,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifa3: serial@e6c70000 {\n" + "+\t\tscifa3: serial at e6c70000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c70000 0 0x40>;\n" @@ -110,7 +103,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifa4: serial@e6c78000 {\n" + "+\t\tscifa4: serial at e6c78000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c78000 0 0x40>;\n" @@ -124,7 +117,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifa5: serial@e6c80000 {\n" + "+\t\tscifa5: serial at e6c80000 {\n" "+\t\t\tcompatible = \"renesas,scifa-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifa\", \"renesas,scifa\";\n" "+\t\t\treg = <0 0xe6c80000 0 0x40>;\n" @@ -138,7 +131,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifb0: serial@e6c20000 {\n" + "+\t\tscifb0: serial at e6c20000 {\n" "+\t\t\tcompatible = \"renesas,scifb-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifb\", \"renesas,scifb\";\n" "+\t\t\treg = <0 0xe6c20000 0 0x100>;\n" @@ -152,7 +145,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifb1: serial@e6c30000 {\n" + "+\t\tscifb1: serial at e6c30000 {\n" "+\t\t\tcompatible = \"renesas,scifb-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifb\", \"renesas,scifb\";\n" "+\t\t\treg = <0 0xe6c30000 0 0x100>;\n" @@ -166,7 +159,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscifb2: serial@e6ce0000 {\n" + "+\t\tscifb2: serial at e6ce0000 {\n" "+\t\t\tcompatible = \"renesas,scifb-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scifb\", \"renesas,scifb\";\n" "+\t\t\treg = <0 0xe6ce0000 0 0x100>;\n" @@ -180,7 +173,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif0: serial@e6e60000 {\n" + "+\t\tscif0: serial at e6e60000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6e60000 0 0x40>;\n" @@ -195,7 +188,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif1: serial@e6e68000 {\n" + "+\t\tscif1: serial at e6e68000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6e68000 0 0x40>;\n" @@ -210,7 +203,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif2: serial@e6e58000 {\n" + "+\t\tscif2: serial at e6e58000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6e58000 0 0x40>;\n" @@ -225,7 +218,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif3: serial@e6ea8000 {\n" + "+\t\tscif3: serial at e6ea8000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6ea8000 0 0x40>;\n" @@ -240,7 +233,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif4: serial@e6ee0000 {\n" + "+\t\tscif4: serial at e6ee0000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6ee0000 0 0x40>;\n" @@ -255,7 +248,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tscif5: serial@e6ee8000 {\n" + "+\t\tscif5: serial at e6ee8000 {\n" "+\t\t\tcompatible = \"renesas,scif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-scif\", \"renesas,scif\";\n" "+\t\t\treg = <0 0xe6ee8000 0 0x40>;\n" @@ -270,7 +263,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\thscif0: serial@e62c0000 {\n" + "+\t\thscif0: serial at e62c0000 {\n" "+\t\t\tcompatible = \"renesas,hscif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-hscif\", \"renesas,hscif\";\n" "+\t\t\treg = <0 0xe62c0000 0 0x60>;\n" @@ -285,7 +278,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\thscif1: serial@e62c8000 {\n" + "+\t\thscif1: serial at e62c8000 {\n" "+\t\t\tcompatible = \"renesas,hscif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-hscif\", \"renesas,hscif\";\n" "+\t\t\treg = <0 0xe62c8000 0 0x60>;\n" @@ -300,7 +293,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\thscif2: serial@e62d0000 {\n" + "+\t\thscif2: serial at e62d0000 {\n" "+\t\t\tcompatible = \"renesas,hscif-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-gen2-hscif\", \"renesas,hscif\";\n" "+\t\t\treg = <0 0xe62d0000 0 0x60>;\n" @@ -318,4 +311,4 @@ " \n" " \t/* External root clock */" -c7af8badacc0b53fe8a30d3d4883f5c7ddf070a6d2e1d44d66272f2a75ecb8b3 +5f40b120f30eae4cc93b69f13df1c6cd45db6b43ecec1feaf8ae35712677ac34
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.