diff for duplicates of <20170205002103.GA22672@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index 7deedde..6ec5ff5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote: > ts-ale-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; > ts-rdy-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; > + -> + watchdog@2a { +> + watchdog at 2a { > + compatible = "technologic,ts4600-wdt"; > + reg = <0x2a>; > + }; diff --git a/a/content_digest b/N1/content_digest index 9e5d61a..be4dd36 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,34 +1,8 @@ "ref\020170203194729.20995-7-sebastien.bourdelin@savoirfairelinux.com\0" - "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [v2,6/6] watchdog: ts4600: add driver for TS-4600 watchdog\0" + "From\0linux@roeck-us.net (Guenter Roeck)\0" + "Subject\0[v2,6/6] watchdog: ts4600: add driver for TS-4600 watchdog\0" "Date\0Sat, 4 Feb 2017 16:21:03 -0800\0" - "To\0Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-watchdog@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - kernel@savoirfairelinux.com - robh@kernel.org - linus.walleij@linaro.org - fabio.estevam@nxp.com - mark@embeddedarm.com - kris@embeddedarm.com - horms+renesas@verge.net.au - treding@nvidia.com - jonathanh@nvidia.com - f.fainelli@gmail.com - kernel@pengutronix.de - shawnguo@kernel.org - linux@armlinux.org.uk - wim@iguana.be - mark.rutland@arm.com - damien.riegel@savoirfairelinux.com - lucile.quirion@savoirfairelinux.com - olof@lixom.net - arnd@arndb.de - suzuki.poulose@arm.com - will.deacon@arm.com - " yamada.masahiro@socionext.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote:\n" @@ -93,7 +67,7 @@ "> \t\tts-ale-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;\n" "> \t\tts-rdy-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;\n" "> +\n" - "> +\t\twatchdog@2a {\n" + "> +\t\twatchdog at 2a {\n" "> +\t\t\tcompatible = \"technologic,ts4600-wdt\";\n" "> +\t\t\treg = <0x2a>;\n" "> +\t\t};\n" @@ -392,4 +366,4 @@ "> +MODULE_LICENSE(\"GPL v2\");\n" "> +MODULE_ALIAS(\"platform:ts4600_wdt\");" -5d786c3e754a381ae6dbef49e61724a3f6d6ca8c9ce0df7d396c9cfcbf6d4766 +2bc9326afc3329b045af61b8d51284432a73b14956ccbb7dcca613776a75ed9e
diff --git a/a/1.txt b/N2/1.txt index 7deedde..6c81368 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -18,7 +18,7 @@ On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote: > - use the max_hw_heartbeat_ms callback instead of the max_timeout > callback (suggested by Guenter Roeck) > -> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com> +> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org> > --- > .../devicetree/bindings/watchdog/ts4600-wdt.txt | 16 ++ > arch/arm/boot/dts/imx28-ts4600-common.dtsi | 5 + @@ -111,7 +111,7 @@ On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote: > + * Watchdog driver for TS-4600 based boards > + * > + * Copyright (c) 2016 - Savoir-faire Linux -> + * Author: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com> +> + * Author: Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -121,7 +121,7 @@ On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote: > + * accessed using a GPIO bit-banged bus called the NBUS by Technologic Systems. > + * The logic for the watchdog is the same then for the TS-4800 SoM, only the way > + * to access it change, therefore this driver is heavely based on the ts4800_wdt -> + * driver from Damien Riegel <damien.riegel@savoirfairelinux.com>. +> + * driver from Damien Riegel <damien.riegel-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>. > + */ > + > +#include <linux/kernel.h> @@ -355,6 +355,10 @@ the remove function and platform_set_drvdata(). > + > +module_platform_driver(ts4600_wdt_driver); > + -> +MODULE_AUTHOR("Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>"); +> +MODULE_AUTHOR("Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:ts4600_wdt"); +-- +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 9e5d61a..bd6fdd2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,34 +1,35 @@ "ref\020170203194729.20995-7-sebastien.bourdelin@savoirfairelinux.com\0" - "From\0Guenter Roeck <linux@roeck-us.net>\0" + "ref\020170203194729.20995-7-sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org\0" + "From\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" "Subject\0Re: [v2,6/6] watchdog: ts4600: add driver for TS-4600 watchdog\0" "Date\0Sat, 4 Feb 2017 16:21:03 -0800\0" - "To\0Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-watchdog@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - kernel@savoirfairelinux.com - robh@kernel.org - linus.walleij@linaro.org - fabio.estevam@nxp.com - mark@embeddedarm.com - kris@embeddedarm.com - horms+renesas@verge.net.au - treding@nvidia.com - jonathanh@nvidia.com - f.fainelli@gmail.com - kernel@pengutronix.de - shawnguo@kernel.org - linux@armlinux.org.uk - wim@iguana.be - mark.rutland@arm.com - damien.riegel@savoirfairelinux.com - lucile.quirion@savoirfairelinux.com - olof@lixom.net - arnd@arndb.de - suzuki.poulose@arm.com - will.deacon@arm.com - " yamada.masahiro@socionext.com\0" + "To\0Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>\0" + "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + kernel-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org + robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org + fabio.estevam-3arQi8VN3Tc@public.gmane.org + mark-L1vi/lXTdtvnC/t2CciAbw@public.gmane.org + kris-L1vi/lXTdtvnC/t2CciAbw@public.gmane.org + horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org + treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org + jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org + f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org + shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org + wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + damien.riegel-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org + lucile.quirion-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org + olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org + arnd-r2nGTMty4D4@public.gmane.org + suzuki.poulose-5wv7dgnIgG8@public.gmane.org + will.deacon-5wv7dgnIgG8@public.gmane.org + " yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org\0" "\00:1\0" "b\0" "On Fri, Feb 03, 2017 at 02:47:29PM -0500, Sebastien Bourdelin wrote:\n" @@ -51,7 +52,7 @@ "> - use the max_hw_heartbeat_ms callback instead of the max_timeout\n" "> callback (suggested by Guenter Roeck)\n" "> \n" - "> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>\n" + "> Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>\n" "> ---\n" "> .../devicetree/bindings/watchdog/ts4600-wdt.txt | 16 ++\n" "> arch/arm/boot/dts/imx28-ts4600-common.dtsi | 5 +\n" @@ -144,7 +145,7 @@ "> + * Watchdog driver for TS-4600 based boards\n" "> + *\n" "> + * Copyright (c) 2016 - Savoir-faire Linux\n" - "> + * Author: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>\n" + "> + * Author: Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -154,7 +155,7 @@ "> + * accessed using a GPIO bit-banged bus called the NBUS by Technologic Systems.\n" "> + * The logic for the watchdog is the same then for the TS-4800 SoM, only the way\n" "> + * to access it change, therefore this driver is heavely based on the ts4800_wdt\n" - "> + * driver from Damien Riegel <damien.riegel@savoirfairelinux.com>.\n" + "> + * driver from Damien Riegel <damien.riegel-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>.\n" "> + */\n" "> +\n" "> +#include <linux/kernel.h>\n" @@ -388,8 +389,12 @@ "> +\n" "> +module_platform_driver(ts4600_wdt_driver);\n" "> +\n" - "> +MODULE_AUTHOR(\"Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>\");\n" + "> +MODULE_AUTHOR(\"Sebastien Bourdelin <sebastien.bourdelin-4ysUXcep3aM1wj+D4I0NRVaTQe2KTcn/@public.gmane.org>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" - "> +MODULE_ALIAS(\"platform:ts4600_wdt\");" + "> +MODULE_ALIAS(\"platform:ts4600_wdt\");\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 -5d786c3e754a381ae6dbef49e61724a3f6d6ca8c9ce0df7d396c9cfcbf6d4766 +158c7c2ce81b432c902a96afa32188e0aa1740d34151e659ee7791b803e51f6a
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.