diff for duplicates of <510FA09F.7030604@ti.com> diff --git a/a/1.txt b/N1/1.txt index c182dea..44cbe95 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On 1/24/2013 2:08 PM, Kumar, Anil wrote: > Add OF_DEV_AUXDATA for wdt driver in da850 board dt > file to use wdt clock. > -> Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> +> Signed-off-by: Kumar, Anil <anilkumar.v-l0cyMroinI0@public.gmane.org> > --- > :100644 100644 37c27af... 1b295d2... M arch/arm/mach-davinci/da8xx-dt.c > arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++- @@ -31,14 +31,14 @@ Thanks, Sekhar ----8<---- -From: "Kumar, Anil" <anilkumar.v@ti.com> +From: "Kumar, Anil" <anilkumar.v-l0cyMroinI0@public.gmane.org> Date: Thu, 24 Jan 2013 14:08:14 +0530 Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node Add da850 wdt DT node. -Signed-off-by: Kumar, Anil <anilkumar.v@ti.com> -Signed-off-by: Sekhar Nori <nsekhar@ti.com> +Signed-off-by: Kumar, Anil <anilkumar.v-l0cyMroinI0@public.gmane.org> +Signed-off-by: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org> --- arch/arm/boot/dts/da850-evm.dts | 3 +++ arch/arm/boot/dts/da850.dtsi | 5 +++++ @@ -50,14 +50,14 @@ index fa04152..cc777dc 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -30,6 +30,9 @@ - rtc0: rtc at 1c23000 { + rtc0: rtc@1c23000 { status = "okay"; }; -+ wdt: wdt at 1c21000 { ++ wdt: wdt@1c21000 { + status = "okay"; + }; }; - nand_cs3 at 62000000 { + nand_cs3@62000000 { status = "okay"; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 8dd15c0..2800090 100644 @@ -67,13 +67,13 @@ index 8dd15c0..2800090 100644 19>; status = "disabled"; }; -+ wdt: wdt at 1c21000 { ++ wdt: wdt@1c21000 { + compatible = "ti,davinci-wdt"; + reg = <0x21000 0xfff>; + status = "disabled"; + }; }; - nand_cs3 at 62000000 { + nand_cs3@62000000 { compatible = "ti,davinci-nand"; diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..90c3c69 100644 diff --git a/a/content_digest b/N1/content_digest index b9cdacd..02d990b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01359016695-10362-1-git-send-email-anilkumar.v@ti.com\0" "ref\01359016695-10362-3-git-send-email-anilkumar.v@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry\0" + "ref\01359016695-10362-3-git-send-email-anilkumar.v-l0cyMroinI0@public.gmane.org\0" + "From\0Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>\0" + "Subject\0Re: [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry\0" "Date\0Mon, 4 Feb 2013 17:20:55 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kumar" + " Anil <anilkumar.v-l0cyMroinI0@public.gmane.org>\0" + "Cc\0davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org" + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + b-cousson-l0cyMroinI0@public.gmane.org + tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org + grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org + hs-ynQEQJNshbs@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Hi Anil,\n" @@ -12,7 +24,7 @@ "> Add OF_DEV_AUXDATA for wdt driver in da850 board dt\n" "> file to use wdt clock.\n" "> \n" - "> Signed-off-by: Kumar, Anil <anilkumar.v@ti.com>\n" + "> Signed-off-by: Kumar, Anil <anilkumar.v-l0cyMroinI0@public.gmane.org>\n" "> ---\n" "> :100644 100644 37c27af... 1b295d2... M\tarch/arm/mach-davinci/da8xx-dt.c\n" "> arch/arm/mach-davinci/da8xx-dt.c | 8 +++++++-\n" @@ -39,14 +51,14 @@ "Sekhar\n" "\n" "----8<----\n" - "From: \"Kumar, Anil\" <anilkumar.v@ti.com>\n" + "From: \"Kumar, Anil\" <anilkumar.v-l0cyMroinI0@public.gmane.org>\n" "Date: Thu, 24 Jan 2013 14:08:14 +0530\n" "Subject: [PATCH 1/1] ARM: davinci: da850: add wdt DT node\n" "\n" "Add da850 wdt DT node.\n" "\n" - "Signed-off-by: Kumar, Anil <anilkumar.v@ti.com>\n" - "Signed-off-by: Sekhar Nori <nsekhar@ti.com>\n" + "Signed-off-by: Kumar, Anil <anilkumar.v-l0cyMroinI0@public.gmane.org>\n" + "Signed-off-by: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/da850-evm.dts | 3 +++\n" " arch/arm/boot/dts/da850.dtsi | 5 +++++\n" @@ -58,14 +70,14 @@ "--- a/arch/arm/boot/dts/da850-evm.dts\n" "+++ b/arch/arm/boot/dts/da850-evm.dts\n" "@@ -30,6 +30,9 @@\n" - " \t\trtc0: rtc at 1c23000 {\n" + " \t\trtc0: rtc@1c23000 {\n" " \t\t\tstatus = \"okay\";\n" " \t\t};\n" - "+\t\twdt: wdt at 1c21000 {\n" + "+\t\twdt: wdt@1c21000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" " \t};\n" - " \tnand_cs3 at 62000000 {\n" + " \tnand_cs3@62000000 {\n" " \t\tstatus = \"okay\";\n" "diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "index 8dd15c0..2800090 100644\n" @@ -75,13 +87,13 @@ " \t\t\t\t 19>;\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - "+\t\twdt: wdt at 1c21000 {\n" + "+\t\twdt: wdt@1c21000 {\n" "+\t\t\tcompatible = \"ti,davinci-wdt\";\n" "+\t\t\treg = <0x21000 0xfff>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" " \t};\n" - " \tnand_cs3 at 62000000 {\n" + " \tnand_cs3@62000000 {\n" " \t\tcompatible = \"ti,davinci-nand\";\n" "diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c\n" "index 37c27af..90c3c69 100644\n" @@ -107,4 +119,4 @@ " \tda8xx_uart_clk_enable();\n" } -41b98bedafd97ca3dfd7e90bb78a7201cf2414b89c70f1add2e75cfd32ba3a03 +587f75aaf06f2db3d7ac75a05acabfef1f9a5d0d416a4434f1a50690ae105802
diff --git a/a/1.txt b/N2/1.txt index c182dea..6aa079b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -50,14 +50,14 @@ index fa04152..cc777dc 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -30,6 +30,9 @@ - rtc0: rtc at 1c23000 { + rtc0: rtc@1c23000 { status = "okay"; }; -+ wdt: wdt at 1c21000 { ++ wdt: wdt@1c21000 { + status = "okay"; + }; }; - nand_cs3 at 62000000 { + nand_cs3@62000000 { status = "okay"; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 8dd15c0..2800090 100644 @@ -67,13 +67,13 @@ index 8dd15c0..2800090 100644 19>; status = "disabled"; }; -+ wdt: wdt at 1c21000 { ++ wdt: wdt@1c21000 { + compatible = "ti,davinci-wdt"; + reg = <0x21000 0xfff>; + status = "disabled"; + }; }; - nand_cs3 at 62000000 { + nand_cs3@62000000 { compatible = "ti,davinci-nand"; diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af..90c3c69 100644 diff --git a/a/content_digest b/N2/content_digest index b9cdacd..be59f41 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01359016695-10362-1-git-send-email-anilkumar.v@ti.com\0" "ref\01359016695-10362-3-git-send-email-anilkumar.v@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH 2/2] ARM: davinci: da850: add wdt OF_DEV_AUXDATA entry\0" "Date\0Mon, 4 Feb 2013 17:20:55 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kumar" + " Anil <anilkumar.v@ti.com>\0" + "Cc\0<devicetree-discuss@lists.ozlabs.org>" + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <davinci-linux-open-source@linux.davincidsp.com> + <b-cousson@ti.com> + <tony@atomide.com> + <grant.likely@secretlab.ca> + <rob.herring@calxeda.com> + <linux@arm.linux.org.uk> + <khilman@deeprootsystems.com> + " <hs@denx.de>\0" "\00:1\0" "b\0" "Hi Anil,\n" @@ -58,14 +70,14 @@ "--- a/arch/arm/boot/dts/da850-evm.dts\n" "+++ b/arch/arm/boot/dts/da850-evm.dts\n" "@@ -30,6 +30,9 @@\n" - " \t\trtc0: rtc at 1c23000 {\n" + " \t\trtc0: rtc@1c23000 {\n" " \t\t\tstatus = \"okay\";\n" " \t\t};\n" - "+\t\twdt: wdt at 1c21000 {\n" + "+\t\twdt: wdt@1c21000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" " \t};\n" - " \tnand_cs3 at 62000000 {\n" + " \tnand_cs3@62000000 {\n" " \t\tstatus = \"okay\";\n" "diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "index 8dd15c0..2800090 100644\n" @@ -75,13 +87,13 @@ " \t\t\t\t 19>;\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - "+\t\twdt: wdt at 1c21000 {\n" + "+\t\twdt: wdt@1c21000 {\n" "+\t\t\tcompatible = \"ti,davinci-wdt\";\n" "+\t\t\treg = <0x21000 0xfff>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" " \t};\n" - " \tnand_cs3 at 62000000 {\n" + " \tnand_cs3@62000000 {\n" " \t\tcompatible = \"ti,davinci-nand\";\n" "diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c\n" "index 37c27af..90c3c69 100644\n" @@ -107,4 +119,4 @@ " \tda8xx_uart_clk_enable();\n" } -41b98bedafd97ca3dfd7e90bb78a7201cf2414b89c70f1add2e75cfd32ba3a03 +4e1728c20185595b4237d622ba100eb2fb9f0807cf725179e6ee9d56d3afd861
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.