diff for duplicates of <20151028001920.GY13239@google.com> diff --git a/a/1.txt b/N1/1.txt index e77ef3d..6899a61 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,14 +24,14 @@ On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote: > +}; > > - soc: soc { -> - i2c0: i2c@66080000 { +> - i2c0: i2c at 66080000 { > - status = "ok"; > - }; > +&i2c0 { > + status = "ok"; > +}; > -> - i2c1: i2c@660b0000 { +> - i2c1: i2c at 660b0000 { > - status = "ok"; > - }; > +&i2c1 { @@ -42,11 +42,11 @@ On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote: > + status = "ok"; > +}; > -> - uart3: serial@66130000 { +> - uart3: serial at 66130000 { > - status = "ok"; > - }; > +&nand { -> + nandcs@0 { +> + nandcs at 0 { > + compatible = "brcm,nandcs"; > + reg = <0>; > + nand-ecc-mode = "hw"; @@ -65,7 +65,7 @@ On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote: > reg = <0x66220000 0x28>; > }; > + -> + nand: nand@66460000 { +> + nand: nand at 66460000 { > + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; Technically, the binding says you should also have "brcm,brcmnand" as a diff --git a/a/content_digest b/N1/content_digest index b55cac5..e738c26 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,29 +1,9 @@ "ref\01445577373-21252-1-git-send-email-anup.patel@broadcom.com\0" "ref\01445577373-21252-3-git-send-email-anup.patel@broadcom.com\0" - "From\0Brian Norris <computersforpeace@gmail.com>\0" - "Subject\0Re: [PATCH v3 2/2] arm64: dts: Add BRCM IPROC NAND DT node for NS2\0" + "From\0computersforpeace@gmail.com (Brian Norris)\0" + "Subject\0[PATCH v3 2/2] arm64: dts: Add BRCM IPROC NAND DT node for NS2\0" "Date\0Tue, 27 Oct 2015 17:19:20 -0700\0" - "To\0Anup Patel <anup.patel@broadcom.com>\0" - "Cc\0David Woodhouse <dwmw2@infradead.org>" - Linux MTD <linux-mtd@lists.infradead.org> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Sudeep Holla <sudeep.holla@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Ray Jui <rjui@broadcom.com> - Scott Branden <sbranden@broadcom.com> - Florian Fainelli <f.fainelli@gmail.com> - Pramod KUMAR <pramodku@broadcom.com> - Vikram Prakash <vikramp@broadcom.com> - Sandeep Tripathy <tripathy@broadcom.com> - Linux ARM Kernel <linux-arm-kernel@lists.infradead.org> - Device Tree <devicetree@vger.kernel.org> - Linux Kernel <linux-kernel@vger.kernel.org> - " BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote:\n" @@ -52,14 +32,14 @@ "> +};\n" "> \n" "> -\tsoc: soc {\n" - "> -\t\ti2c0: i2c@66080000 {\n" + "> -\t\ti2c0: i2c at 66080000 {\n" "> -\t\t\tstatus = \"ok\";\n" "> -\t\t};\n" "> +&i2c0 {\n" "> +\tstatus = \"ok\";\n" "> +};\n" "> \n" - "> -\t\ti2c1: i2c@660b0000 {\n" + "> -\t\ti2c1: i2c at 660b0000 {\n" "> -\t\t\tstatus = \"ok\";\n" "> -\t\t};\n" "> +&i2c1 {\n" @@ -70,11 +50,11 @@ "> +\tstatus = \"ok\";\n" "> +};\n" "> \n" - "> -\t\tuart3: serial@66130000 {\n" + "> -\t\tuart3: serial at 66130000 {\n" "> -\t\t\tstatus = \"ok\";\n" "> -\t\t};\n" "> +&nand {\n" - "> +\tnandcs@0 {\n" + "> +\tnandcs at 0 {\n" "> +\t\tcompatible = \"brcm,nandcs\";\n" "> +\t\treg = <0>;\n" "> +\t\tnand-ecc-mode = \"hw\";\n" @@ -93,7 +73,7 @@ "> \t\t\treg = <0x66220000 0x28>;\n" "> \t\t};\n" "> +\n" - "> +\t\tnand: nand@66460000 {\n" + "> +\t\tnand: nand at 66460000 {\n" "> +\t\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\";\n" "\n" "Technically, the binding says you should also have \"brcm,brcmnand\" as a\n" @@ -118,4 +98,4 @@ "> 1.9.1\n" > -6eee1db33cfb9ba4ce0b3f904ee9cba8a138ff1a63d61e5bdb1af48fe3cd6ebd +7b5f7e0e511f6746adecb663e8f3933d5e6e0ae4c911ba3d45d9a3b7218f8ab3
diff --git a/a/1.txt b/N2/1.txt index e77ef3d..f91df1c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,9 +5,9 @@ On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote: > > This patch also fixes use of node labels in ns2-svk.dts. > -> Signed-off-by: Anup Patel <anup.patel@broadcom.com> -> Reviewed-by: Ray Jui <rjui@broadcom.com> -> Reviewed-by: Scott Branden <sbranden@broadcom.com> +> Signed-off-by: Anup Patel <anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> +> Reviewed-by: Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> +> Reviewed-by: Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> > --- > arch/arm64/boot/dts/broadcom/ns2-svk.dts | 30 ++++++++++++++++++++---------- > arch/arm64/boot/dts/broadcom/ns2.dtsi | 14 ++++++++++++++ @@ -71,7 +71,7 @@ On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote: Technically, the binding says you should also have "brcm,brcmnand" as a last resort. Otherwise (for the NAND parts): -Reviewed-by: Brian Norris <computersforpeace@gmail.com> +Reviewed-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > + reg = <0x66460000 0x600>, > + <0x67015408 0x600>, @@ -88,4 +88,8 @@ Reviewed-by: Brian Norris <computersforpeace@gmail.com> > }; > -- > 1.9.1 -> +> +-- +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 b55cac5..85746e6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,30 @@ "ref\01445577373-21252-1-git-send-email-anup.patel@broadcom.com\0" "ref\01445577373-21252-3-git-send-email-anup.patel@broadcom.com\0" - "From\0Brian Norris <computersforpeace@gmail.com>\0" + "ref\01445577373-21252-3-git-send-email-anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org\0" + "From\0Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [PATCH v3 2/2] arm64: dts: Add BRCM IPROC NAND DT node for NS2\0" "Date\0Tue, 27 Oct 2015 17:19:20 -0700\0" - "To\0Anup Patel <anup.patel@broadcom.com>\0" - "Cc\0David Woodhouse <dwmw2@infradead.org>" - Linux MTD <linux-mtd@lists.infradead.org> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Sudeep Holla <sudeep.holla@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Ray Jui <rjui@broadcom.com> - Scott Branden <sbranden@broadcom.com> - Florian Fainelli <f.fainelli@gmail.com> - Pramod KUMAR <pramodku@broadcom.com> - Vikram Prakash <vikramp@broadcom.com> - Sandeep Tripathy <tripathy@broadcom.com> - Linux ARM Kernel <linux-arm-kernel@lists.infradead.org> - Device Tree <devicetree@vger.kernel.org> - Linux Kernel <linux-kernel@vger.kernel.org> - " BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>\0" + "To\0Anup Patel <anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\0" + "Cc\0David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>" + Linux MTD <linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Pramod KUMAR <pramodku-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Vikram Prakash <vikramp-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Sandeep Tripathy <tripathy-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Linux ARM Kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + Device Tree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Linux Kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " BCM Kernel Feedback <bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\0" "\00:1\0" "b\0" "On Fri, Oct 23, 2015 at 10:46:13AM +0530, Anup Patel wrote:\n" @@ -33,9 +34,9 @@ "> \n" "> This patch also fixes use of node labels in ns2-svk.dts.\n" "> \n" - "> Signed-off-by: Anup Patel <anup.patel@broadcom.com>\n" - "> Reviewed-by: Ray Jui <rjui@broadcom.com>\n" - "> Reviewed-by: Scott Branden <sbranden@broadcom.com>\n" + "> Signed-off-by: Anup Patel <anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" + "> Reviewed-by: Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" + "> Reviewed-by: Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" "> ---\n" "> arch/arm64/boot/dts/broadcom/ns2-svk.dts | 30 ++++++++++++++++++++----------\n" "> arch/arm64/boot/dts/broadcom/ns2.dtsi | 14 ++++++++++++++\n" @@ -99,7 +100,7 @@ "Technically, the binding says you should also have \"brcm,brcmnand\" as a\n" "last resort. Otherwise (for the NAND parts):\n" "\n" - "Reviewed-by: Brian Norris <computersforpeace@gmail.com>\n" + "Reviewed-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "\n" "> +\t\t\treg = <0x66460000 0x600>,\n" "> +\t\t\t <0x67015408 0x600>,\n" @@ -116,6 +117,10 @@ "> };\n" "> -- \n" "> 1.9.1\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 -6eee1db33cfb9ba4ce0b3f904ee9cba8a138ff1a63d61e5bdb1af48fe3cd6ebd +9c329de0904e1ed6896f82439cac8f990ce688f3cbade4f25e63964394a0107f
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.