diff for duplicates of <20160810083421.GD16481@gobelin> diff --git a/a/1.txt b/N1/1.txt index da00fcf..5c9e247 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ On Wed, Aug 10, 2016 at 01:59:26PM +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>; @@ -33,7 +33,7 @@ On Wed, Aug 10, 2016 at 01:59:26PM +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 e89e9cd..6ff08e2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,10 +6,19 @@ "ref\057AAE1D1.5080000@ti.com\0" "ref\020160810082631.GC16481@gobelin\0" "ref\057AAE5E6.8090304@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 08:34:21 +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 01:59:26PM +0530, Sekhar Nori wrote:\n" @@ -37,7 +46,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" @@ -47,7 +56,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" @@ -86,4 +95,4 @@ " \n" Karl -d639fd8a2735fe1f367d76eac5f9ae9e7280d77857e267929dfc3201f2dfb3ec +06457c5cbacddae6a34b558cdba5d518e9142acb6a0ddae197a45008035c573e
diff --git a/a/1.txt b/N2/1.txt index da00fcf..5c9e247 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ On Wed, Aug 10, 2016 at 01:59:26PM +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>; @@ -33,7 +33,7 @@ On Wed, Aug 10, 2016 at 01:59:26PM +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 e89e9cd..6bab003 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,10 +6,19 @@ "ref\057AAE1D1.5080000@ti.com\0" "ref\020160810082631.GC16481@gobelin\0" "ref\057AAE5E6.8090304@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 08:34:21 +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 01:59:26PM +0530, Sekhar Nori wrote:\n" @@ -37,7 +46,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" @@ -47,7 +56,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" @@ -86,4 +95,4 @@ " \n" Karl -d639fd8a2735fe1f367d76eac5f9ae9e7280d77857e267929dfc3201f2dfb3ec +b8cf30735b1f6dfe579649b38ccbaab543b2b1ee3ce848116c1c657a2ac5cf40
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.