diff for duplicates of <57AAE728.8000209@ti.com> diff --git a/a/1.txt b/N1/1.txt index 62ca53b..7177a71 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On Wednesday 10 August 2016 02:04 PM, Karl Beldan wrote: >>>>>>>> dma-names = "tx", "rx"; >>>>>>>> }; >>>>>>>> }; ->>>>>>>> + aemif: aemif at 68000000 { +>>>>>>>> + aemif: aemif@68000000 { >>>>>>>> + compatible = "ti,da850-aemif"; >>>>>>>> + #address-cells = <2>; >>>>>>>> + #size-cells = <1>; @@ -34,7 +34,7 @@ On Wednesday 10 August 2016 02:04 PM, 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 bbcf96e..91c734b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,10 +7,19 @@ "ref\020160810082631.GC16481@gobelin\0" "ref\057AAE5E6.8090304@ti.com\0" "ref\020160810083421.GD16481@gobelin\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 2/4] ARM: dts: da850: Add an aemif node\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: dts: da850: Add an aemif node\0" "Date\0Wed, 10 Aug 2016 14:04:48 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Karl Beldan <kbeldan@baylibre.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 Wednesday 10 August 2016 02:04 PM, Karl Beldan wrote:\n" @@ -39,7 +48,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" @@ -49,7 +58,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" @@ -91,4 +100,4 @@ "Regards,\n" Sekhar -e482cc149b6c4f29caf95f3c8749ca9f1614ca7edc5232d77a54496e6a8251a0 +07bcb6cadaaffc0489bce03f1830674af58328a88ec30204badd264692df57a5
diff --git a/a/1.txt b/N2/1.txt index 62ca53b..7177a71 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -24,7 +24,7 @@ On Wednesday 10 August 2016 02:04 PM, Karl Beldan wrote: >>>>>>>> dma-names = "tx", "rx"; >>>>>>>> }; >>>>>>>> }; ->>>>>>>> + aemif: aemif at 68000000 { +>>>>>>>> + aemif: aemif@68000000 { >>>>>>>> + compatible = "ti,da850-aemif"; >>>>>>>> + #address-cells = <2>; >>>>>>>> + #size-cells = <1>; @@ -34,7 +34,7 @@ On Wednesday 10 August 2016 02:04 PM, 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 bbcf96e..568b2f2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,10 +7,19 @@ "ref\020160810082631.GC16481@gobelin\0" "ref\057AAE5E6.8090304@ti.com\0" "ref\020160810083421.GD16481@gobelin\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 2/4] ARM: dts: da850: Add an aemif node\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: dts: da850: Add an aemif node\0" "Date\0Wed, 10 Aug 2016 14:04:48 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Karl Beldan <kbeldan@baylibre.com>\0" + "Cc\0<devicetree@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 Wednesday 10 August 2016 02:04 PM, Karl Beldan wrote:\n" @@ -39,7 +48,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" @@ -49,7 +58,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" @@ -91,4 +100,4 @@ "Regards,\n" Sekhar -e482cc149b6c4f29caf95f3c8749ca9f1614ca7edc5232d77a54496e6a8251a0 +150b08b0d5568510629b1557e6e7026604abd3385972cfd74ccb7a36d7f3f8d9
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.