diff for duplicates of <20160810092848.GF16481@gobelin> diff --git a/a/1.txt b/N1/1.txt index e812db1..82f59a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ On Wed, Aug 10, 2016 at 02:04:48PM +0530, Sekhar Nori wrote: > >>>>>>>> dma-names = "tx", "rx"; > >>>>>>>> }; > >>>>>>>> }; -> >>>>>>>> + aemif: aemif at 68000000 { +> >>>>>>>> + aemif: aemif@68000000 { > >>>>>>>> + compatible = "ti,da850-aemif"; > >>>>>>>> + #address-cells = <2>; > >>>>>>>> + #size-cells = <1>; @@ -35,7 +35,7 @@ On Wed, Aug 10, 2016 at 02:04:48PM +0530, Sekhar Nori 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 f0f5ab8..1138641 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,10 +8,19 @@ "ref\057AAE5E6.8090304@ti.com\0" "ref\020160810083421.GD16481@gobelin\0" "ref\057AAE728.8000209@ti.com\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:28:48 +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 02:04:48PM +0530, Sekhar Nori wrote:\n" @@ -41,7 +50,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" @@ -51,7 +60,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" @@ -98,4 +107,4 @@ " \n" Karl -ef7a7b483d9db622ccd82df2eefd6258f0760a7ecf5f66892ad556927fc94a12 +a9f81a41514d772c6363924c703b1515ef8f6300a51fe233225997a274f8e671
diff --git a/a/1.txt b/N2/1.txt index e812db1..82f59a0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ On Wed, Aug 10, 2016 at 02:04:48PM +0530, Sekhar Nori wrote: > >>>>>>>> dma-names = "tx", "rx"; > >>>>>>>> }; > >>>>>>>> }; -> >>>>>>>> + aemif: aemif at 68000000 { +> >>>>>>>> + aemif: aemif@68000000 { > >>>>>>>> + compatible = "ti,da850-aemif"; > >>>>>>>> + #address-cells = <2>; > >>>>>>>> + #size-cells = <1>; @@ -35,7 +35,7 @@ On Wed, Aug 10, 2016 at 02:04:48PM +0530, Sekhar Nori 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 f0f5ab8..1240e17 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,10 +8,19 @@ "ref\057AAE5E6.8090304@ti.com\0" "ref\020160810083421.GD16481@gobelin\0" "ref\057AAE728.8000209@ti.com\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:28:48 +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 02:04:48PM +0530, Sekhar Nori wrote:\n" @@ -41,7 +50,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" @@ -51,7 +60,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" @@ -98,4 +107,4 @@ " \n" Karl -ef7a7b483d9db622ccd82df2eefd6258f0760a7ecf5f66892ad556927fc94a12 +05e898129c282b7881c2a0dd5445bc4fb55d69472b6441faa917ec36d7fa1692
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.