diff for duplicates of <20151123104330.6b9e649c@xhacker> diff --git a/a/1.txt b/N1/1.txt index 1d11eea..c2b1c53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > > }; > > }; > > -> > + i2c0: i2c at 1400 { +> > + i2c0: i2c@1400 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -45,7 +45,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > + i2c1: i2c at 1800 { +> > + i2c1: i2c@1800 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -58,14 +58,14 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > aic: interrupt-controller at 3800 { +> > aic: interrupt-controller@3800 { > > compatible = "snps,dw-apb-ictl"; > > reg = <0x3800 0x30>; > > @@ -319,6 +345,32 @@ > > }; > > }; > > -> > + i2c2: i2c at b000 { +> > + i2c2: i2c@b000 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -78,7 +78,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > + i2c3: i2c at c000 { +> > + i2c3: i2c@c000 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -91,7 +91,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > uart0: uart at d000 { +> > uart0: uart@d000 { > > compatible = "snps,dw-apb-uart"; > > reg = <0xd000 0x100>; > > diff --git a/a/content_digest b/N1/content_digest index 2825085..11e8eae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,20 @@ "ref\01448012821-7413-1-git-send-email-jszhang@marvell.com\0" "ref\01448012821-7413-2-git-send-email-jszhang@marvell.com\0" "ref\0564F8EF3.5010508@gmail.com\0" - "From\0jszhang@marvell.com (Jisheng Zhang)\0" - "Subject\0[PATCH 1/2] arm64: dts: berlin4ct: add I2C nodes for BG4CT\0" + "From\0Jisheng Zhang <jszhang@marvell.com>\0" + "Subject\0Re: [PATCH 1/2] arm64: dts: berlin4ct: add I2C nodes for BG4CT\0" "Date\0Mon, 23 Nov 2015 10:43:30 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + catalin.marinas@arm.com + will.deacon@arm.com + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 20 Nov 2015 22:21:55 +0100\n" @@ -27,7 +37,7 @@ "> > \t\t\t\t};\n" "> > \t\t\t};\n" "> > \n" - "> > +\t\t\ti2c0: i2c at 1400 {\n" + "> > +\t\t\ti2c0: i2c@1400 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -54,7 +64,7 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ti2c1: i2c at 1800 {\n" + "> > +\t\t\ti2c1: i2c@1800 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -67,14 +77,14 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > \t\t\taic: interrupt-controller at 3800 {\n" + "> > \t\t\taic: interrupt-controller@3800 {\n" "> > \t\t\t\tcompatible = \"snps,dw-apb-ictl\";\n" "> > \t\t\t\treg = <0x3800 0x30>;\n" "> > @@ -319,6 +345,32 @@\n" "> > \t\t\t\t};\n" "> > \t\t\t};\n" "> > \n" - "> > +\t\t\ti2c2: i2c at b000 {\n" + "> > +\t\t\ti2c2: i2c@b000 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -87,7 +97,7 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ti2c3: i2c at c000 {\n" + "> > +\t\t\ti2c3: i2c@c000 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -100,10 +110,10 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > \t\t\tuart0: uart at d000 {\n" + "> > \t\t\tuart0: uart@d000 {\n" "> > \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> > \t\t\t\treg = <0xd000 0x100>;\n" "> > \n" > -86bf721a186c7f4bc47ec217fb085c9684205aa975507407204bab9339a70447 +1f5d008a6d77f4f4558d12ad3e89d755a607c8a5de67bb0a9703cff54be15e20
diff --git a/a/1.txt b/N2/1.txt index 1d11eea..c2b1c53 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > > }; > > }; > > -> > + i2c0: i2c at 1400 { +> > + i2c0: i2c@1400 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -45,7 +45,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > + i2c1: i2c at 1800 { +> > + i2c1: i2c@1800 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -58,14 +58,14 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > aic: interrupt-controller at 3800 { +> > aic: interrupt-controller@3800 { > > compatible = "snps,dw-apb-ictl"; > > reg = <0x3800 0x30>; > > @@ -319,6 +345,32 @@ > > }; > > }; > > -> > + i2c2: i2c at b000 { +> > + i2c2: i2c@b000 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -78,7 +78,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > + i2c3: i2c at c000 { +> > + i2c3: i2c@c000 { > > + compatible = "snps,designware-i2c"; > > + #address-cells = <1>; > > + #size-cells = <0>; @@ -91,7 +91,7 @@ Jisheng > > + status = "disabled"; > > + }; > > + -> > uart0: uart at d000 { +> > uart0: uart@d000 { > > compatible = "snps,dw-apb-uart"; > > reg = <0xd000 0x100>; > > diff --git a/a/content_digest b/N2/content_digest index 2825085..8115cc5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,20 @@ "ref\01448012821-7413-1-git-send-email-jszhang@marvell.com\0" "ref\01448012821-7413-2-git-send-email-jszhang@marvell.com\0" "ref\0564F8EF3.5010508@gmail.com\0" - "From\0jszhang@marvell.com (Jisheng Zhang)\0" - "Subject\0[PATCH 1/2] arm64: dts: berlin4ct: add I2C nodes for BG4CT\0" + "From\0Jisheng Zhang <jszhang@marvell.com>\0" + "Subject\0Re: [PATCH 1/2] arm64: dts: berlin4ct: add I2C nodes for BG4CT\0" "Date\0Mon, 23 Nov 2015 10:43:30 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0<robh+dt@kernel.org>" + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <catalin.marinas@arm.com> + <will.deacon@arm.com> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Fri, 20 Nov 2015 22:21:55 +0100\n" @@ -27,7 +37,7 @@ "> > \t\t\t\t};\n" "> > \t\t\t};\n" "> > \n" - "> > +\t\t\ti2c0: i2c at 1400 {\n" + "> > +\t\t\ti2c0: i2c@1400 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -54,7 +64,7 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ti2c1: i2c at 1800 {\n" + "> > +\t\t\ti2c1: i2c@1800 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -67,14 +77,14 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > \t\t\taic: interrupt-controller at 3800 {\n" + "> > \t\t\taic: interrupt-controller@3800 {\n" "> > \t\t\t\tcompatible = \"snps,dw-apb-ictl\";\n" "> > \t\t\t\treg = <0x3800 0x30>;\n" "> > @@ -319,6 +345,32 @@\n" "> > \t\t\t\t};\n" "> > \t\t\t};\n" "> > \n" - "> > +\t\t\ti2c2: i2c at b000 {\n" + "> > +\t\t\ti2c2: i2c@b000 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -87,7 +97,7 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ti2c3: i2c at c000 {\n" + "> > +\t\t\ti2c3: i2c@c000 {\n" "> > +\t\t\t\tcompatible = \"snps,designware-i2c\";\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" @@ -100,10 +110,10 @@ "> > +\t\t\t\tstatus = \"disabled\";\n" "> > +\t\t\t};\n" "> > +\n" - "> > \t\t\tuart0: uart at d000 {\n" + "> > \t\t\tuart0: uart@d000 {\n" "> > \t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> > \t\t\t\treg = <0xd000 0x100>;\n" "> > \n" > -86bf721a186c7f4bc47ec217fb085c9684205aa975507407204bab9339a70447 +36dbf63ffca6b57dcda371e0f0a49e8df4b326e130e701d5106449da9580a207
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.