diff for duplicates of <577FD159.7000905@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index 6ba002d..3b7daa6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > status = "disabled"; > }; > -> + amac0: ethernet at 22000 { +> + amac0: ethernet@22000 { > + compatible = "brcm,nsp-amac"; > + reg = <0x022000 0x1000>, > + <0x110000 0x1000>; @@ -30,7 +30,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > + status = "disabled"; > + }; > + -> + amac1: ethernet at 23000 { +> + amac1: ethernet@23000 { > + compatible = "brcm,nsp-amac"; > + reg = <0x023000 0x1000>, > + <0x111000 0x1000>; @@ -39,7 +39,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > + status = "disabled"; > + }; > + -> nand: nand at 26000 { +> nand: nand@26000 { > compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; > reg = <0x026000 0x600>, > diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts diff --git a/a/content_digest b/N1/content_digest index ae9e5b7..68ce582 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,24 @@ "ref\01467993362-13229-1-git-send-email-jon.mason@broadcom.com\0" - "From\0scott.branden@broadcom.com (Scott Branden)\0" - "Subject\0[PATCH 7/7] ARM: dts: NSP: Add bgmac entries\0" + "From\0Scott Branden <scott.branden@broadcom.com>\0" + "Subject\0Re: [PATCH 7/7] ARM: dts: NSP: Add bgmac entries\0" "Date\0Fri, 8 Jul 2016 09:14:17 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jon.mason@broadcom.com>" + davem@davemloft.net + " f.fainelli@gmail.com\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Scott Branden <sbranden@broadcom.com> + Pawel Moll <pawel.moll@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + hauke@hauke-m.de + zajec5@gmail.com + linux-kernel@vger.kernel.org + Ray Jui <rjui@broadcom.com> + Rob Herring <robh+dt@kernel.org> + bcm-kernel-feedback-list@broadcom.com + Kumar Gala <galak@codeaurora.org> + netdev@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Jon,\n" @@ -28,7 +44,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" ">\n" - "> +\t\tamac0: ethernet at 22000 {\n" + "> +\t\tamac0: ethernet@22000 {\n" "> +\t\t\tcompatible = \"brcm,nsp-amac\";\n" "> +\t\t\treg = <0x022000 0x1000>,\n" "> +\t\t\t <0x110000 0x1000>;\n" @@ -37,7 +53,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tamac1: ethernet at 23000 {\n" + "> +\t\tamac1: ethernet@23000 {\n" "> +\t\t\tcompatible = \"brcm,nsp-amac\";\n" "> +\t\t\treg = <0x023000 0x1000>,\n" "> +\t\t\t <0x111000 0x1000>;\n" @@ -46,7 +62,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tnand: nand at 26000 {\n" + "> \t\tnand: nand@26000 {\n" "> \t\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\";\n" "> \t\t\treg = <0x026000 0x600>,\n" "> diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts\n" @@ -73,4 +89,4 @@ "Regards,\n" Scott -4414d38ff0e130d199383dc6e7860197c9895cae83aef2263a8a0cf5bc53a110 +3733b7b03df4e8c8f207ace729c7cec6888bf525adc8a76688c335c9478e65de
diff --git a/a/1.txt b/N2/1.txt index 6ba002d..3b7daa6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > status = "disabled"; > }; > -> + amac0: ethernet at 22000 { +> + amac0: ethernet@22000 { > + compatible = "brcm,nsp-amac"; > + reg = <0x022000 0x1000>, > + <0x110000 0x1000>; @@ -30,7 +30,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > + status = "disabled"; > + }; > + -> + amac1: ethernet at 23000 { +> + amac1: ethernet@23000 { > + compatible = "brcm,nsp-amac"; > + reg = <0x023000 0x1000>, > + <0x111000 0x1000>; @@ -39,7 +39,7 @@ On 16-07-08 08:56 AM, Jon Mason wrote: > + status = "disabled"; > + }; > + -> nand: nand at 26000 { +> nand: nand@26000 { > compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; > reg = <0x026000 0x600>, > diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts diff --git a/a/content_digest b/N2/content_digest index ae9e5b7..264da50 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,24 @@ "ref\01467993362-13229-1-git-send-email-jon.mason@broadcom.com\0" - "From\0scott.branden@broadcom.com (Scott Branden)\0" - "Subject\0[PATCH 7/7] ARM: dts: NSP: Add bgmac entries\0" + "From\0Scott Branden <scott.branden@broadcom.com>\0" + "Subject\0Re: [PATCH 7/7] ARM: dts: NSP: Add bgmac entries\0" "Date\0Fri, 8 Jul 2016 09:14:17 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jon.mason@broadcom.com>" + davem@davemloft.net + " f.fainelli@gmail.com\0" + "Cc\0zajec5@gmail.com" + hauke@hauke-m.de + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Ray Jui <rjui@broadcom.com> + Scott Branden <sbranden@broadcom.com> + bcm-kernel-feedback-list@broadcom.com + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Jon,\n" @@ -28,7 +44,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" ">\n" - "> +\t\tamac0: ethernet at 22000 {\n" + "> +\t\tamac0: ethernet@22000 {\n" "> +\t\t\tcompatible = \"brcm,nsp-amac\";\n" "> +\t\t\treg = <0x022000 0x1000>,\n" "> +\t\t\t <0x110000 0x1000>;\n" @@ -37,7 +53,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tamac1: ethernet at 23000 {\n" + "> +\t\tamac1: ethernet@23000 {\n" "> +\t\t\tcompatible = \"brcm,nsp-amac\";\n" "> +\t\t\treg = <0x023000 0x1000>,\n" "> +\t\t\t <0x111000 0x1000>;\n" @@ -46,7 +62,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tnand: nand at 26000 {\n" + "> \t\tnand: nand@26000 {\n" "> \t\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\";\n" "> \t\t\treg = <0x026000 0x600>,\n" "> diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts\n" @@ -73,4 +89,4 @@ "Regards,\n" Scott -4414d38ff0e130d199383dc6e7860197c9895cae83aef2263a8a0cf5bc53a110 +f15e82c71ed51e5e73b8c1caf47bbbe2f254d82defd1d830af5ae61dec7ea92c
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.