diff for duplicates of <5570320.hDPc0mxmnU@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 4c30633..e89a94a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,18 +12,19 @@ This patch is against 'renesas-devel-20150211-v3.19' tag of Simon Horman's 1 file changed, 6 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -107,6 +107,12 @@ <0 17 IRQ_TYPE_LEVEL_HIGH>; }; -+ pfc: pin-controller@e6060000 { ++ pfc: pin-controller at e6060000 { + compatible = "renesas,pfc-r8a7794"; + reg = <0 0xe6060000 0 0x11c>; + #gpio-range-cells = <3>; + }; + - dmac0: dma-controller@e6700000 { + dmac0: dma-controller at e6700000 { compatible = "renesas,rcar-dmac"; reg = <0 0xe6700000 0 0x20000>; diff --git a/a/content_digest b/N1/content_digest index c690b13..7bc53f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: shmobile: r8a7794: add PFC DT support\0" - "Date\0Wed, 11 Feb 2015 22:06:49 +0000\0" + "Date\0Thu, 12 Feb 2015 01:06:49 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -19,20 +19,21 @@ " 1 file changed, 6 insertions(+)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" "@@ -107,6 +107,12 @@\n" " \t\t\t <0 17 IRQ_TYPE_LEVEL_HIGH>;\n" " \t};\n" " \n" - "+\tpfc: pin-controller@e6060000 {\n" + "+\tpfc: pin-controller at e6060000 {\n" "+\t\tcompatible = \"renesas,pfc-r8a7794\";\n" "+\t\treg = <0 0xe6060000 0 0x11c>;\n" "+\t\t#gpio-range-cells = <3>;\n" "+\t};\n" "+\n" - " \tdmac0: dma-controller@e6700000 {\n" + " \tdmac0: dma-controller at e6700000 {\n" " \t\tcompatible = \"renesas,rcar-dmac\";\n" " \t\treg = <0 0xe6700000 0 0x20000>;" -fe1300ab8760fec4775cfc633abe3206aca9509c4bb875d537836394804cfb4b +0989435f2bcac4c5e91d748f080bebaf8f4460f058f70db95d9059e4f01a9604
diff --git a/a/1.txt b/N2/1.txt index 4c30633..8dc8939 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,8 @@ This patch is against 'renesas-devel-20150211-v3.19' tag of Simon Horman's 1 file changed, 6 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -107,6 +107,12 @@ <0 17 IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N2/content_digest index c690b13..0f6ebd8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ARM: shmobile: r8a7794: add PFC DT support\0" - "Date\0Wed, 11 Feb 2015 22:06:49 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 12 Feb 2015 01:06:49 +0300\0" + "To\0horms@verge.net.au" + linux-sh@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + " devicetree@vger.kernel.org\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Define the generic R8A7794 part of the PFC device node.\n" @@ -19,7 +29,8 @@ " 1 file changed, 6 insertions(+)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" "@@ -107,6 +107,12 @@\n" " \t\t\t <0 17 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -35,4 +46,4 @@ " \t\tcompatible = \"renesas,rcar-dmac\";\n" " \t\treg = <0 0xe6700000 0 0x20000>;" -fe1300ab8760fec4775cfc633abe3206aca9509c4bb875d537836394804cfb4b +eced43acf309f26fe072edde0ba4c69d65389f130ddb215c4f080abd74af5011
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.