diff for duplicates of <3051459.2yiprFO374@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index bfc5f00..5c8502a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,13 +7,14 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 1 file changed, 42 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 @@ -648,6 +648,48 @@ status = "disabled"; }; -+ pci0: pci@ee090000 { ++ pci0: pci at ee090000 { + compatible = "renesas,pci-r8a7794"; + device_type = "pci"; + reg = <0 0xee090000 0 0xc00>, @@ -34,7 +35,7 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi + 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>; + }; + -+ pci1: pci@ee0d0000 { ++ pci1: pci at ee0d0000 { + compatible = "renesas,pci-r8a7794"; + device_type = "pci"; + reg = <0 0xee0d0000 0 0xc00>, diff --git a/a/content_digest b/N1/content_digest index d9805d9..e83f7c8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\03151312.grtDDBsSl8@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH 1/2] ARM: shmobile: r8a7794: add internal PCI bridge nodes\0" - "Date\0Sat, 12 Sep 2015 22:30:05 +0000\0" + "Date\0Sun, 13 Sep 2015 01:30:05 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -14,13 +14,14 @@ " 1 file changed, 42 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" "@@ -648,6 +648,48 @@\n" " \t\tstatus = \"disabled\";\n" " \t};\n" " \n" - "+\tpci0: pci@ee090000 {\n" + "+\tpci0: pci at ee090000 {\n" "+\t\tcompatible = \"renesas,pci-r8a7794\";\n" "+\t\tdevice_type = \"pci\";\n" "+\t\treg = <0 0xee090000 0 0xc00>,\n" @@ -41,7 +42,7 @@ "+\t\t\t\t 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;\n" "+\t};\n" "+\n" - "+\tpci1: pci@ee0d0000 {\n" + "+\tpci1: pci at ee0d0000 {\n" "+\t\tcompatible = \"renesas,pci-r8a7794\";\n" "+\t\tdevice_type = \"pci\";\n" "+\t\treg = <0 0xee0d0000 0 0xc00>,\n" @@ -66,4 +67,4 @@ " \t\t#address-cells = <2>;\n" " \t\t#size-cells = <2>;" -43a6cc4ba11b3e1f72eb0e790d17107cccdece548b16c428bf768ed0812478ef +4a8ae0d793f5911f20f4aa4edac9bde53910f1b1263e9d33ebc78a933f7e77ec
diff --git a/a/1.txt b/N2/1.txt index bfc5f00..129bed3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,7 +7,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 1 file changed, 42 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 @@ -648,6 +648,48 @@ status = "disabled"; diff --git a/a/content_digest b/N2/content_digest index d9805d9..102f718 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\03151312.grtDDBsSl8@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH 1/2] ARM: shmobile: r8a7794: add internal PCI bridge nodes\0" - "Date\0Sat, 12 Sep 2015 22:30:05 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Sun, 13 Sep 2015 01:30:05 +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" "Add device nodes for the R8A7794 internal PCI bridge devices.\n" @@ -14,7 +24,8 @@ " 1 file changed, 42 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" "@@ -648,6 +648,48 @@\n" " \t\tstatus = \"disabled\";\n" @@ -66,4 +77,4 @@ " \t\t#address-cells = <2>;\n" " \t\t#size-cells = <2>;" -43a6cc4ba11b3e1f72eb0e790d17107cccdece548b16c428bf768ed0812478ef +9c4983dbd738aa1b148a2dafe35312659a9b203542455bb963dc03234093eee4
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.