diff for duplicates of <528829DB.7020003@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 15966cd..d56530d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Yet another form of formatting. Also, wonder if it makes sense to merge this wit > Optional properties: > > - timeout-sec: Contains the watchdog timeout in seconds -> @@ -21,4 +25,5 @@ wdt: wdt@2320000 { +> @@ -21,4 +25,5 @@ wdt: wdt at 2320000 { > compatible = "ti,davinci-wdt"; > reg = <0x02320000 0x80>; > timeout-sec = <30>; diff --git a/a/content_digest b/N1/content_digest index 518c940..f349123 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01383680783-12114-8-git-send-email-ivan.khoronzhuk@ti.com\0" "ref\0527A28E8.4010204@ti.com\0" - "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: Fwd: [PATCH 7/8] watchdog: davinci: add \"clocks\" property\0" + "From\0linux@roeck-us.net (Guenter Roeck)\0" + "Subject\0Fwd: [PATCH 7/8] watchdog: davinci: add \"clocks\" property\0" "Date\0Sat, 16 Nov 2013 18:28:43 -0800\0" - "To\0ivan.khoronzhuk <ivan.khoronzhuk@ti.com>" - Santosh Shilimkar <santosh.shilimkar@ti.com> - wim@iguana.be - nsekhar@ti.com - linux-watchdog@vger.kernel.org - " devicetree@vger.kernel.org\0" - "Cc\0grant.likely@linaro.org" - rob.herring@calxeda.com - pawel.moll@arm.com - mark.rutland@arm.com - swarren@wwwdotorg.org - galak@kernel.crashing.org - ijc+devicetree@hellion.org.uk - linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 11/06/2013 03:32 AM, ivan.khoronzhuk wrote:\n" @@ -47,7 +33,7 @@ "> Optional properties:\n" ">\n" "> - timeout-sec:\t\tContains the watchdog timeout in seconds\n" - "> @@ -21,4 +25,5 @@ wdt: wdt@2320000 {\n" + "> @@ -21,4 +25,5 @@ wdt: wdt at 2320000 {\n" "> \tcompatible = \"ti,davinci-wdt\";\n" "> \treg = <0x02320000 0x80>;\n" "> \ttimeout-sec = <30>;\n" @@ -55,4 +41,4 @@ "> };\n" > -4893d6cd125e0372b4e485b23c35ab3bf15b54896e0a392abaa3cb8069939a48 +3047dc0e91e580024a47ec924ee838d7fbed323cacf18fd7bdd269b8f768e83b
diff --git a/a/1.txt b/N2/1.txt index 15966cd..3d0c393 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On 11/06/2013 03:32 AM, ivan.khoronzhuk wrote: > The Keystone arch is using clocks in DT and source clock for watchdog > has to be specified, so add this to binding. > -> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> +> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk-l0cyMroinI0@public.gmane.org> > --- > .../devicetree/bindings/watchdog/davinci-wdt.txt | 5 +++++ > 1 file changed, 5 insertions(+) @@ -32,3 +32,8 @@ Yet another form of formatting. Also, wonder if it makes sense to merge this wit > + clocks = <&clkwdtimer0>; > }; > + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 518c940..618ae26 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,30 +1,31 @@ "ref\01383680783-12114-8-git-send-email-ivan.khoronzhuk@ti.com\0" "ref\0527A28E8.4010204@ti.com\0" - "From\0Guenter Roeck <linux@roeck-us.net>\0" + "ref\0527A28E8.4010204-l0cyMroinI0@public.gmane.org\0" + "From\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" "Subject\0Re: Fwd: [PATCH 7/8] watchdog: davinci: add \"clocks\" property\0" "Date\0Sat, 16 Nov 2013 18:28:43 -0800\0" - "To\0ivan.khoronzhuk <ivan.khoronzhuk@ti.com>" - Santosh Shilimkar <santosh.shilimkar@ti.com> - wim@iguana.be - nsekhar@ti.com - linux-watchdog@vger.kernel.org - " devicetree@vger.kernel.org\0" - "Cc\0grant.likely@linaro.org" - rob.herring@calxeda.com - pawel.moll@arm.com - mark.rutland@arm.com - swarren@wwwdotorg.org - galak@kernel.crashing.org - ijc+devicetree@hellion.org.uk - linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0ivan.khoronzhuk <ivan.khoronzhuk-l0cyMroinI0@public.gmane.org>" + Santosh Shilimkar <santosh.shilimkar-l0cyMroinI0@public.gmane.org> + wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org + nsekhar-l0cyMroinI0@public.gmane.org + linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" + rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org + galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 11/06/2013 03:32 AM, ivan.khoronzhuk wrote:\n" "> The Keystone arch is using clocks in DT and source clock for watchdog\n" "> has to be specified, so add this to binding.\n" ">\n" - "> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>\n" + "> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk-l0cyMroinI0@public.gmane.org>\n" "> ---\n" "> .../devicetree/bindings/watchdog/davinci-wdt.txt | 5 +++++\n" "> 1 file changed, 5 insertions(+)\n" @@ -53,6 +54,11 @@ "> \ttimeout-sec = <30>;\n" "> +\tclocks = <&clkwdtimer0>;\n" "> };\n" - > + ">\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -4893d6cd125e0372b4e485b23c35ab3bf15b54896e0a392abaa3cb8069939a48 +35ef13137e0ce47251e0cad021ad705fbca1f65ba32328cf97e675804b2cf76a
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.