diff for duplicates of <20160810094224.GH16481@gobelin> diff --git a/a/1.txt b/N1/1.txt index 4aa1d9d..276a718 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote: > > >>>>>>>> dma-names = "tx", "rx"; > > >>>>>>>> }; > > >>>>>>>> }; -> > >>>>>>>> + aemif: aemif at 68000000 { +> > >>>>>>>> + aemif: aemif@68000000 { > > >>>>>>>> + compatible = "ti,da850-aemif"; > > >>>>>>>> + #address-cells = <2>; > > >>>>>>>> + #size-cells = <1>; @@ -36,7 +36,7 @@ On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote: > > >>>>>>>> + 1 0 0x68000000 0x00008000>; > > >>>>>>>> + status = "disabled"; > > >>>>>>>> + }; -> > >>>>>>>> nand_cs3 at 62000000 { +> > >>>>>>>> nand_cs3@62000000 { > > >>>>>>>> compatible = "ti,davinci-nand"; > > >>>>>>>> reg = <0x62000000 0x807ff > > >>>>>>> diff --git a/a/content_digest b/N1/content_digest index 4aca668..812e4fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,10 +8,19 @@ "ref\020160810083421.GD16481@gobelin\0" "ref\057AAE728.8000209@ti.com\0" "ref\020160810092848.GF16481@gobelin\0" - "From\0kbeldan@baylibre.com (Karl Beldan)\0" - "Subject\0[PATCH 2/4] ARM: dts: da850: Add an aemif node\0" + "From\0Karl Beldan <kbeldan@baylibre.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: dts: da850: Add an aemif node\0" "Date\0Wed, 10 Aug 2016 09:42:24 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sekhar Nori <nsekhar@ti.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Karl Beldan <karl.beldan+oss@gmail.com> + Kevin Hilman <khilman@baylibre.com> + linux-kernel@vger.kernel.org + Russell King <linux@armlinux.org.uk> + Rob Herring <robh+dt@kernel.org> + Santosh Shilimkar <ssantosh@kernel.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote:\n" @@ -42,7 +51,7 @@ "> > >>>>>>>> \t\t\tdma-names = \"tx\", \"rx\";\n" "> > >>>>>>>> \t\t};\n" "> > >>>>>>>> \t};\n" - "> > >>>>>>>> +\taemif: aemif at 68000000 {\n" + "> > >>>>>>>> +\taemif: aemif@68000000 {\n" "> > >>>>>>>> +\t\tcompatible = \"ti,da850-aemif\";\n" "> > >>>>>>>> +\t\t#address-cells = <2>;\n" "> > >>>>>>>> +\t\t#size-cells = <1>;\n" @@ -52,7 +61,7 @@ "> > >>>>>>>> +\t\t\t 1 0 0x68000000 0x00008000>;\n" "> > >>>>>>>> +\t\tstatus = \"disabled\";\n" "> > >>>>>>>> +\t};\n" - "> > >>>>>>>> \tnand_cs3 at 62000000 {\n" + "> > >>>>>>>> \tnand_cs3@62000000 {\n" "> > >>>>>>>> \t\tcompatible = \"ti,davinci-nand\";\n" "> > >>>>>>>> \t\treg = <0x62000000 0x807ff\n" "> > >>>>>>>\n" @@ -103,4 +112,4 @@ " \n" Karl -5999925a9553fe40cda495640dc59c1316c7940874a27ed2fef61a27bd9ea69b +35bf6a11537fbd22c7091e81739b2a9806cdd5eafe0eb6b588e51bc9606631fe
diff --git a/a/1.txt b/N2/1.txt index 4aa1d9d..276a718 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,7 +26,7 @@ On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote: > > >>>>>>>> dma-names = "tx", "rx"; > > >>>>>>>> }; > > >>>>>>>> }; -> > >>>>>>>> + aemif: aemif at 68000000 { +> > >>>>>>>> + aemif: aemif@68000000 { > > >>>>>>>> + compatible = "ti,da850-aemif"; > > >>>>>>>> + #address-cells = <2>; > > >>>>>>>> + #size-cells = <1>; @@ -36,7 +36,7 @@ On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote: > > >>>>>>>> + 1 0 0x68000000 0x00008000>; > > >>>>>>>> + status = "disabled"; > > >>>>>>>> + }; -> > >>>>>>>> nand_cs3 at 62000000 { +> > >>>>>>>> nand_cs3@62000000 { > > >>>>>>>> compatible = "ti,davinci-nand"; > > >>>>>>>> reg = <0x62000000 0x807ff > > >>>>>>> diff --git a/a/content_digest b/N2/content_digest index 4aca668..7d662e6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,10 +8,19 @@ "ref\020160810083421.GD16481@gobelin\0" "ref\057AAE728.8000209@ti.com\0" "ref\020160810092848.GF16481@gobelin\0" - "From\0kbeldan@baylibre.com (Karl Beldan)\0" - "Subject\0[PATCH 2/4] ARM: dts: da850: Add an aemif node\0" + "From\0Karl Beldan <kbeldan@baylibre.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: dts: da850: Add an aemif node\0" "Date\0Wed, 10 Aug 2016 09:42:24 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sekhar Nori <nsekhar@ti.com>\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + Mark Rutland <mark.rutland@arm.com> + Karl Beldan <karl.beldan+oss@gmail.com> + Kevin Hilman <khilman@baylibre.com> + linux-kernel@vger.kernel.org + Russell King <linux@armlinux.org.uk> + Rob Herring <robh+dt@kernel.org> + " Santosh Shilimkar <ssantosh@kernel.org>\0" "\00:1\0" "b\0" "On Wed, Aug 10, 2016 at 09:28:48AM +0000, Karl Beldan wrote:\n" @@ -42,7 +51,7 @@ "> > >>>>>>>> \t\t\tdma-names = \"tx\", \"rx\";\n" "> > >>>>>>>> \t\t};\n" "> > >>>>>>>> \t};\n" - "> > >>>>>>>> +\taemif: aemif at 68000000 {\n" + "> > >>>>>>>> +\taemif: aemif@68000000 {\n" "> > >>>>>>>> +\t\tcompatible = \"ti,da850-aemif\";\n" "> > >>>>>>>> +\t\t#address-cells = <2>;\n" "> > >>>>>>>> +\t\t#size-cells = <1>;\n" @@ -52,7 +61,7 @@ "> > >>>>>>>> +\t\t\t 1 0 0x68000000 0x00008000>;\n" "> > >>>>>>>> +\t\tstatus = \"disabled\";\n" "> > >>>>>>>> +\t};\n" - "> > >>>>>>>> \tnand_cs3 at 62000000 {\n" + "> > >>>>>>>> \tnand_cs3@62000000 {\n" "> > >>>>>>>> \t\tcompatible = \"ti,davinci-nand\";\n" "> > >>>>>>>> \t\treg = <0x62000000 0x807ff\n" "> > >>>>>>>\n" @@ -103,4 +112,4 @@ " \n" Karl -5999925a9553fe40cda495640dc59c1316c7940874a27ed2fef61a27bd9ea69b +0d2e9f568f7c37b0e1316e56d8da35935253e87c12bdaaa02a92459bd514a686
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.