diff for duplicates of <4442711.L2kXfQCuTM@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 40c2de4..a4aa86e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi #power-domain-cells = <1>; }; -+ dmac0: dma-controller@e6700000 { ++ dmac0: dma-controller at e6700000 { + compatible = "renesas,dmac-r8a7743", + "renesas,rcar-dmac"; + reg = <0 0xe6700000 0 0x20000>; @@ -53,7 +53,7 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + dma-channels = <15>; + }; + -+ dmac1: dma-controller@e6720000 { ++ dmac1: dma-controller at e6720000 { + compatible = "renesas,dmac-r8a7743", + "renesas,rcar-dmac"; + reg = <0 0xe6720000 0 0x20000>; @@ -86,5 +86,5 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi + }; + /* Special CPG clocks */ - cpg_clocks: cpg_clocks@e6150000 { + cpg_clocks: cpg_clocks at e6150000 { compatible = "renesas,r8a7743-cpg-clocks", diff --git a/a/content_digest b/N1/content_digest index ecaf165..81fe5e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01987532.PE2ex6PrJ5@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH RFC v2 6/12] ARM: dts: r8a7743: add SYS-DMAC support\0" "Date\0Fri, 30 Sep 2016 01:26:43 +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 SYS-DMAC0/1 in the R8A7743 device tree.\n" @@ -35,7 +28,7 @@ " \t\t\t#power-domain-cells = <1>;\n" " \t\t};\n" " \n" - "+\t\tdmac0: dma-controller@e6700000 {\n" + "+\t\tdmac0: dma-controller at e6700000 {\n" "+\t\t\tcompatible = \"renesas,dmac-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-dmac\";\n" "+\t\t\treg = <0 0xe6700000 0 0x20000>;\n" @@ -67,7 +60,7 @@ "+\t\t\tdma-channels = <15>;\n" "+\t\t};\n" "+\n" - "+\t\tdmac1: dma-controller@e6720000 {\n" + "+\t\tdmac1: dma-controller at e6720000 {\n" "+\t\t\tcompatible = \"renesas,dmac-r8a7743\",\n" "+\t\t\t\t \"renesas,rcar-dmac\";\n" "+\t\t\treg = <0 0xe6720000 0 0x20000>;\n" @@ -100,7 +93,7 @@ "+\t\t};\n" "+\n" " \t\t/* Special CPG clocks */\n" - " \t\tcpg_clocks: cpg_clocks@e6150000 {\n" + " \t\tcpg_clocks: cpg_clocks at e6150000 {\n" " \t\t\tcompatible = \"renesas,r8a7743-cpg-clocks\"," -21b3fcf0374e9b8942e6fd535b1a3fe7bbab6e30cfad590ab439577fcbfe583b +82e9676e39b679adcd28041f5d220452d80ba1f961a760a457009e2ebdbcc8d6
diff --git a/a/1.txt b/N2/1.txt index 40c2de4..1b10ff1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,10 +1,10 @@ Describe SYS-DMAC0/1 in the R8A7743 device tree. Based on the original (and large) patch by Dmitry Shifrin -<dmitry.shifrin@cogentembedded.com>. +<dmitry.shifrin-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>. -Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> -Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> +Reviewed-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> --- Changes in version 2: @@ -88,3 +88,8 @@ Index: renesas/arch/arm/boot/dts/r8a7743.dtsi /* Special CPG clocks */ cpg_clocks: cpg_clocks@e6150000 { compatible = "renesas,r8a7743-cpg-clocks", + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index ecaf165..1ca928c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,25 @@ "ref\01987532.PE2ex6PrJ5@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "ref\01987532.PE2ex6PrJ5-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org\0" + "From\0Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>\0" "Subject\0[PATCH RFC v2 6/12] ARM: dts: r8a7743: add SYS-DMAC support\0" "Date\0Fri, 30 Sep 2016 01:26:43 +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\0horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org" + linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Describe SYS-DMAC0/1 in the R8A7743 device tree.\n" "\n" "Based on the original (and large) patch by Dmitry Shifrin\n" - "<dmitry.shifrin@cogentembedded.com>.\n" + "<dmitry.shifrin-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>.\n" "\n" - "Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\n" - "Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>\n" + "Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>\n" + "Reviewed-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>\n" "\n" "---\n" "Changes in version 2:\n" @@ -101,6 +102,11 @@ "+\n" " \t\t/* Special CPG clocks */\n" " \t\tcpg_clocks: cpg_clocks@e6150000 {\n" - " \t\t\tcompatible = \"renesas,r8a7743-cpg-clocks\"," + " \t\t\tcompatible = \"renesas,r8a7743-cpg-clocks\",\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -21b3fcf0374e9b8942e6fd535b1a3fe7bbab6e30cfad590ab439577fcbfe583b +5c8907615191017f3e558ab149ca483586dd6105cf1f22dc186669005560bcb1
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.