* [PATCH V4 0/3] add UniPhier watchdog support @ 2017-06-14 7:53 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim, linux Cc: linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi, Keiji Hayashibara This series adds support for watchdog timer implemented on UniPhier LD11 and LD20 SoCs. This driver supports watchdog and system reset for SoCs. patch V3 http://www.spinics.net/lists/linux-watchdog/msg11889.html patch V2 http://www.spinics.net/lists/linux-watchdog/msg11852.html patch V1 http://www.spinics.net/lists/linux-watchdog/msg11782.html Changes between V4 and V3 ========================= * Add own dependencies to Kconfig. Changes between V3 and V2 ========================= * Make it possible to take a timeout from devicetree. * Sort #include headlers alphabetically. * Correct the description of dt-bindings document and this patch comment. * Correct the description of license as GPLv2. * Correct MODULE_AUTHOR() * Remove unnecessary code. Changes between V2 and V1 ========================= 1. Add barrier code in uniphier_watchdog_ping() and __uniphier_watchdog_start(). 2. Fix issues according to review comments. Keiji Hayashibara (3): dt-bindings: watchdog: add description for UniPhier WDT controller watchdog: uniphier: add UniPhier watchdog driver arm64: dts: uniphier: add watchdog node for LD11 and LD20 .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++ Documentation/watchdog/watchdog-parameters.txt | 6 + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 + drivers/watchdog/Kconfig | 12 + drivers/watchdog/Makefile | 1 + drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++ 7 files changed, 315 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt create mode 100644 drivers/watchdog/uniphier_wdt.c -- 2.7.4 ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH V4 0/3] add UniPhier watchdog support @ 2017-06-14 7:53 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim-IQzOog9fTRqzQB+pC5nmwQ, linux-0h96xk9xTtrk1uMJSBkQmQ Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA, masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A, jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A, yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A, hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A, owada.kiyoshi-uWyLwvC0a2jby3iVrkZq2A, Keiji Hayashibara This series adds support for watchdog timer implemented on UniPhier LD11 and LD20 SoCs. This driver supports watchdog and system reset for SoCs. patch V3 http://www.spinics.net/lists/linux-watchdog/msg11889.html patch V2 http://www.spinics.net/lists/linux-watchdog/msg11852.html patch V1 http://www.spinics.net/lists/linux-watchdog/msg11782.html Changes between V4 and V3 ========================= * Add own dependencies to Kconfig. Changes between V3 and V2 ========================= * Make it possible to take a timeout from devicetree. * Sort #include headlers alphabetically. * Correct the description of dt-bindings document and this patch comment. * Correct the description of license as GPLv2. * Correct MODULE_AUTHOR() * Remove unnecessary code. Changes between V2 and V1 ========================= 1. Add barrier code in uniphier_watchdog_ping() and __uniphier_watchdog_start(). 2. Fix issues according to review comments. Keiji Hayashibara (3): dt-bindings: watchdog: add description for UniPhier WDT controller watchdog: uniphier: add UniPhier watchdog driver arm64: dts: uniphier: add watchdog node for LD11 and LD20 .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++ Documentation/watchdog/watchdog-parameters.txt | 6 + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 + drivers/watchdog/Kconfig | 12 + drivers/watchdog/Makefile | 1 + drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++ 7 files changed, 315 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt create mode 100644 drivers/watchdog/uniphier_wdt.c -- 2.7.4 -- 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 ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller 2017-06-14 7:53 ` Keiji Hayashibara (?) @ 2017-06-14 7:53 ` Keiji Hayashibara 2017-06-18 14:05 ` Rob Herring 2017-06-20 20:55 ` Guenter Roeck -1 siblings, 2 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim, linux Cc: linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi, Keiji Hayashibara Add uniphier-wdt dt-bindings documentation. Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> --- .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt b/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt new file mode 100644 index 0000000..bf63375 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt @@ -0,0 +1,20 @@ +UniPhier watchdog timer controller + +This UniPhier watchdog timer controller must be under sysctrl node. + +Required properties: +- compatible: should be "socionext,uniphier-wdt" + +Example: + + sysctrl@61840000 { + compatible = "socionext,uniphier-ld11-sysctrl", + "simple-mfd", "syscon"; + reg = <0x61840000 0x4000>; + + watchdog { + compatible = "socionext,uniphier-wdt"; + } + + other nodes ... + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller 2017-06-14 7:53 ` [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller Keiji Hayashibara @ 2017-06-18 14:05 ` Rob Herring 2017-06-20 20:55 ` Guenter Roeck 1 sibling, 0 replies; 17+ messages in thread From: Rob Herring @ 2017-06-18 14:05 UTC (permalink / raw) To: Keiji Hayashibara Cc: wim, linux, linux-watchdog, linux-kernel, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi On Wed, Jun 14, 2017 at 04:53:43PM +0900, Keiji Hayashibara wrote: > Add uniphier-wdt dt-bindings documentation. > > Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> > --- > .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller 2017-06-14 7:53 ` [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller Keiji Hayashibara 2017-06-18 14:05 ` Rob Herring @ 2017-06-20 20:55 ` Guenter Roeck 1 sibling, 0 replies; 17+ messages in thread From: Guenter Roeck @ 2017-06-20 20:55 UTC (permalink / raw) To: Keiji Hayashibara Cc: wim, linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi On Wed, Jun 14, 2017 at 04:53:43PM +0900, Keiji Hayashibara wrote: > Add uniphier-wdt dt-bindings documentation. > > Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt b/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt > new file mode 100644 > index 0000000..bf63375 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt > @@ -0,0 +1,20 @@ > +UniPhier watchdog timer controller > + > +This UniPhier watchdog timer controller must be under sysctrl node. > + > +Required properties: > +- compatible: should be "socionext,uniphier-wdt" > + > +Example: > + > + sysctrl@61840000 { > + compatible = "socionext,uniphier-ld11-sysctrl", > + "simple-mfd", "syscon"; > + reg = <0x61840000 0x4000>; > + > + watchdog { > + compatible = "socionext,uniphier-wdt"; > + } > + > + other nodes ... > + }; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH V4 2/3] watchdog: uniphier: add UniPhier watchdog driver 2017-06-14 7:53 ` Keiji Hayashibara (?) (?) @ 2017-06-14 7:53 ` Keiji Hayashibara 2017-06-20 20:55 ` Guenter Roeck -1 siblings, 1 reply; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim, linux Cc: linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi, Keiji Hayashibara Add a watchdog driver for Socionext UniPhier series SoC. Note that the timeout value for this device must be a power of 2 because of the specification. Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> --- Documentation/watchdog/watchdog-parameters.txt | 6 + drivers/watchdog/Kconfig | 12 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++++++ 4 files changed, 287 insertions(+) create mode 100644 drivers/watchdog/uniphier_wdt.c diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 4f7d86d..6f9d7b4 100644 --- a/Documentation/watchdog/watchdog-parameters.txt +++ b/Documentation/watchdog/watchdog-parameters.txt @@ -369,6 +369,12 @@ timeout: Watchdog timeout in seconds. (0<timeout<N, default=60) nowayout: Watchdog cannot be stopped once started (default=kernel config parameter) ------------------------------------------------- +uniphier_wdt: +timeout: Watchdog timeout in power of two seconds. + (1 <= timeout <= 128, default=64) +nowayout: Watchdog cannot be stopped once started + (default=kernel config parameter) +------------------------------------------------- w83627hf_wdt: wdt_io: w83627hf/thf WDT io port (default 0x2E) timeout: Watchdog timeout in seconds. 1 <= timeout <= 255, default=60. diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 52a70ee..b83759d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -744,6 +744,18 @@ config ZX2967_WATCHDOG To compile this driver as a module, choose M here: the module will be called zx2967_wdt. +config UNIPHIER_WATCHDOG + tristate "UniPhier watchdog support" + depends on ARCH_UNIPHIER || COMPILE_TEST + depends on OF && MFD_SYSCON + select WATCHDOG_CORE + help + Say Y here to include support watchdog timer embedded + into the UniPhier system. + + To compile this driver as a module, choose M here: the + module will be called uniphier_wdt. + # AVR32 Architecture config AT32AP700X_WDT diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index a2126e2..0928dac 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -84,6 +84,7 @@ obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o +obj-$(CONFIG_UNIPHIER_WATCHDOG) += uniphier_wdt.o # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c new file mode 100644 index 0000000..0ea2339 --- /dev/null +++ b/drivers/watchdog/uniphier_wdt.c @@ -0,0 +1,268 @@ +/* + * Watchdog driver for the UniPhier watchdog timer + * + * (c) Copyright 2014 Panasonic Corporation + * (c) Copyright 2016 Socionext Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/bitops.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/watchdog.h> + +/* WDT timer setting register */ +#define WDTTIMSET 0x3004 +#define WDTTIMSET_PERIOD_MASK (0xf << 0) +#define WDTTIMSET_PERIOD_1_SEC (0x3 << 0) + +/* WDT reset selection register */ +#define WDTRSTSEL 0x3008 +#define WDTRSTSEL_RSTSEL_MASK (0x3 << 0) +#define WDTRSTSEL_RSTSEL_BOTH (0x0 << 0) +#define WDTRSTSEL_RSTSEL_IRQ_ONLY (0x2 << 0) + +/* WDT control register */ +#define WDTCTRL 0x300c +#define WDTCTRL_STATUS BIT(8) +#define WDTCTRL_CLEAR BIT(1) +#define WDTCTRL_ENABLE BIT(0) + +#define SEC_TO_WDTTIMSET_PRD(sec) \ + (ilog2(sec) + WDTTIMSET_PERIOD_1_SEC) + +#define WDTST_TIMEOUT 1000 /* usec */ + +#define WDT_DEFAULT_TIMEOUT 64 /* Default is 64 seconds */ +#define WDT_PERIOD_MIN 1 +#define WDT_PERIOD_MAX 128 + +static unsigned int timeout = 0; +static bool nowayout = WATCHDOG_NOWAYOUT; + +struct uniphier_wdt_dev { + struct watchdog_device wdt_dev; + struct regmap *regmap; +}; + +/* + * UniPhier Watchdog operations + */ +static int uniphier_watchdog_ping(struct watchdog_device *w) +{ + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); + unsigned int val; + int ret; + + /* Clear counter */ + ret = regmap_write_bits(wdev->regmap, WDTCTRL, + WDTCTRL_CLEAR, WDTCTRL_CLEAR); + if (!ret) + /* + * As SoC specification, after clear counter, + * it needs to wait until counter status is 1. + */ + ret = regmap_read_poll_timeout(wdev->regmap, WDTCTRL, val, + (val & WDTCTRL_STATUS), + 0, WDTST_TIMEOUT); + + return ret; +} + +static int __uniphier_watchdog_start(struct regmap *regmap, unsigned int sec) +{ + unsigned int val; + int ret; + + ret = regmap_read_poll_timeout(regmap, WDTCTRL, val, + !(val & WDTCTRL_STATUS), + 0, WDTST_TIMEOUT); + if (ret) + return ret; + + /* Setup period */ + ret = regmap_write(regmap, WDTTIMSET, + SEC_TO_WDTTIMSET_PRD(sec)); + if (ret) + return ret; + + /* Enable and clear watchdog */ + ret = regmap_write(regmap, WDTCTRL, WDTCTRL_ENABLE | WDTCTRL_CLEAR); + if (!ret) + /* + * As SoC specification, after clear counter, + * it needs to wait until counter status is 1. + */ + ret = regmap_read_poll_timeout(regmap, WDTCTRL, val, + (val & WDTCTRL_STATUS), + 0, WDTST_TIMEOUT); + + return ret; +} + +static int __uniphier_watchdog_stop(struct regmap *regmap) +{ + /* Disable and stop watchdog */ + return regmap_write_bits(regmap, WDTCTRL, WDTCTRL_ENABLE, 0); +} + +static int __uniphier_watchdog_restart(struct regmap *regmap, unsigned int sec) +{ + int ret; + + ret = __uniphier_watchdog_stop(regmap); + if (ret) + return ret; + + return __uniphier_watchdog_start(regmap, sec); +} + +static int uniphier_watchdog_start(struct watchdog_device *w) +{ + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); + unsigned int tmp_timeout; + + tmp_timeout = roundup_pow_of_two(w->timeout); + + return __uniphier_watchdog_start(wdev->regmap, tmp_timeout); +} + +static int uniphier_watchdog_stop(struct watchdog_device *w) +{ + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); + + return __uniphier_watchdog_stop(wdev->regmap); +} + +static int uniphier_watchdog_set_timeout(struct watchdog_device *w, + unsigned int t) +{ + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); + unsigned int tmp_timeout; + int ret; + + tmp_timeout = roundup_pow_of_two(t); + if (tmp_timeout == w->timeout) + return 0; + + if (watchdog_active(w)) { + ret = __uniphier_watchdog_restart(wdev->regmap, tmp_timeout); + if (ret) + return ret; + } + + w->timeout = tmp_timeout; + + return 0; +} + +/* + * Kernel Interfaces + */ +static const struct watchdog_info uniphier_wdt_info = { + .identity = "uniphier-wdt", + .options = WDIOF_SETTIMEOUT | + WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE | + WDIOF_OVERHEAT, +}; + +static const struct watchdog_ops uniphier_wdt_ops = { + .owner = THIS_MODULE, + .start = uniphier_watchdog_start, + .stop = uniphier_watchdog_stop, + .ping = uniphier_watchdog_ping, + .set_timeout = uniphier_watchdog_set_timeout, +}; + +static int uniphier_wdt_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct uniphier_wdt_dev *wdev; + struct regmap *regmap; + struct device_node *parent; + int ret; + + wdev = devm_kzalloc(dev, sizeof(*wdev), GFP_KERNEL); + if (!wdev) + return -ENOMEM; + + platform_set_drvdata(pdev, wdev); + + parent = of_get_parent(dev->of_node); /* parent should be syscon node */ + regmap = syscon_node_to_regmap(parent); + of_node_put(parent); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + wdev->regmap = regmap; + wdev->wdt_dev.info = &uniphier_wdt_info; + wdev->wdt_dev.ops = &uniphier_wdt_ops; + wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX; + wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN; + wdev->wdt_dev.parent = dev; + + if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) { + wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT; + } + watchdog_set_nowayout(&wdev->wdt_dev, nowayout); + watchdog_stop_on_reboot(&wdev->wdt_dev); + + watchdog_set_drvdata(&wdev->wdt_dev, wdev); + + uniphier_watchdog_stop(&wdev->wdt_dev); + ret = regmap_write(wdev->regmap, WDTRSTSEL, WDTRSTSEL_RSTSEL_BOTH); + if (ret) + return ret; + + ret = devm_watchdog_register_device(dev, &wdev->wdt_dev); + if (ret) + return ret; + + dev_info(dev, "watchdog driver (timeout=%d sec, nowayout=%d)\n", + wdev->wdt_dev.timeout, nowayout); + + return 0; +} + +static const struct of_device_id uniphier_wdt_dt_ids[] = { + { .compatible = "socionext,uniphier-wdt" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, uniphier_wdt_dt_ids); + +static struct platform_driver uniphier_wdt_driver = { + .probe = uniphier_wdt_probe, + .driver = { + .name = "uniphier-wdt", + .of_match_table = uniphier_wdt_dt_ids, + }, +}; + +module_platform_driver(uniphier_wdt_driver); + +module_param(timeout, uint, 0000); +MODULE_PARM_DESC(timeout, + "Watchdog timeout seconds in power of 2. (0 < timeout < 128, default=" + __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + +module_param(nowayout, bool, 0000); +MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + +MODULE_AUTHOR("Keiji Hayashibara <hayashibara.keiji@socionext.com>"); +MODULE_DESCRIPTION("UniPhier Watchdog Device Driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH V4 2/3] watchdog: uniphier: add UniPhier watchdog driver 2017-06-14 7:53 ` [PATCH V4 2/3] watchdog: uniphier: add UniPhier watchdog driver Keiji Hayashibara @ 2017-06-20 20:55 ` Guenter Roeck 0 siblings, 0 replies; 17+ messages in thread From: Guenter Roeck @ 2017-06-20 20:55 UTC (permalink / raw) To: Keiji Hayashibara Cc: wim, linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi On Wed, Jun 14, 2017 at 04:53:44PM +0900, Keiji Hayashibara wrote: > Add a watchdog driver for Socionext UniPhier series SoC. > Note that the timeout value for this device must be a power > of 2 because of the specification. > > Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Documentation/watchdog/watchdog-parameters.txt | 6 + > drivers/watchdog/Kconfig | 12 ++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++++++ > 4 files changed, 287 insertions(+) > create mode 100644 drivers/watchdog/uniphier_wdt.c > > diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt > index 4f7d86d..6f9d7b4 100644 > --- a/Documentation/watchdog/watchdog-parameters.txt > +++ b/Documentation/watchdog/watchdog-parameters.txt > @@ -369,6 +369,12 @@ timeout: Watchdog timeout in seconds. (0<timeout<N, default=60) > nowayout: Watchdog cannot be stopped once started > (default=kernel config parameter) > ------------------------------------------------- > +uniphier_wdt: > +timeout: Watchdog timeout in power of two seconds. > + (1 <= timeout <= 128, default=64) > +nowayout: Watchdog cannot be stopped once started > + (default=kernel config parameter) > +------------------------------------------------- > w83627hf_wdt: > wdt_io: w83627hf/thf WDT io port (default 0x2E) > timeout: Watchdog timeout in seconds. 1 <= timeout <= 255, default=60. > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 52a70ee..b83759d 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -744,6 +744,18 @@ config ZX2967_WATCHDOG > To compile this driver as a module, choose M here: the > module will be called zx2967_wdt. > > +config UNIPHIER_WATCHDOG > + tristate "UniPhier watchdog support" > + depends on ARCH_UNIPHIER || COMPILE_TEST > + depends on OF && MFD_SYSCON > + select WATCHDOG_CORE > + help > + Say Y here to include support watchdog timer embedded > + into the UniPhier system. > + > + To compile this driver as a module, choose M here: the > + module will be called uniphier_wdt. > + > # AVR32 Architecture > > config AT32AP700X_WDT > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index a2126e2..0928dac 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -84,6 +84,7 @@ obj-$(CONFIG_ATLAS7_WATCHDOG) += atlas7_wdt.o > obj-$(CONFIG_RENESAS_WDT) += renesas_wdt.o > obj-$(CONFIG_ASPEED_WATCHDOG) += aspeed_wdt.o > obj-$(CONFIG_ZX2967_WATCHDOG) += zx2967_wdt.o > +obj-$(CONFIG_UNIPHIER_WATCHDOG) += uniphier_wdt.o > > # AVR32 Architecture > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o > diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c > new file mode 100644 > index 0000000..0ea2339 > --- /dev/null > +++ b/drivers/watchdog/uniphier_wdt.c > @@ -0,0 +1,268 @@ > +/* > + * Watchdog driver for the UniPhier watchdog timer > + * > + * (c) Copyright 2014 Panasonic Corporation > + * (c) Copyright 2016 Socionext Inc. > + * All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <linux/bitops.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/watchdog.h> > + > +/* WDT timer setting register */ > +#define WDTTIMSET 0x3004 > +#define WDTTIMSET_PERIOD_MASK (0xf << 0) > +#define WDTTIMSET_PERIOD_1_SEC (0x3 << 0) > + > +/* WDT reset selection register */ > +#define WDTRSTSEL 0x3008 > +#define WDTRSTSEL_RSTSEL_MASK (0x3 << 0) > +#define WDTRSTSEL_RSTSEL_BOTH (0x0 << 0) > +#define WDTRSTSEL_RSTSEL_IRQ_ONLY (0x2 << 0) > + > +/* WDT control register */ > +#define WDTCTRL 0x300c > +#define WDTCTRL_STATUS BIT(8) > +#define WDTCTRL_CLEAR BIT(1) > +#define WDTCTRL_ENABLE BIT(0) > + > +#define SEC_TO_WDTTIMSET_PRD(sec) \ > + (ilog2(sec) + WDTTIMSET_PERIOD_1_SEC) > + > +#define WDTST_TIMEOUT 1000 /* usec */ > + > +#define WDT_DEFAULT_TIMEOUT 64 /* Default is 64 seconds */ > +#define WDT_PERIOD_MIN 1 > +#define WDT_PERIOD_MAX 128 > + > +static unsigned int timeout = 0; > +static bool nowayout = WATCHDOG_NOWAYOUT; > + > +struct uniphier_wdt_dev { > + struct watchdog_device wdt_dev; > + struct regmap *regmap; > +}; > + > +/* > + * UniPhier Watchdog operations > + */ > +static int uniphier_watchdog_ping(struct watchdog_device *w) > +{ > + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); > + unsigned int val; > + int ret; > + > + /* Clear counter */ > + ret = regmap_write_bits(wdev->regmap, WDTCTRL, > + WDTCTRL_CLEAR, WDTCTRL_CLEAR); > + if (!ret) > + /* > + * As SoC specification, after clear counter, > + * it needs to wait until counter status is 1. > + */ > + ret = regmap_read_poll_timeout(wdev->regmap, WDTCTRL, val, > + (val & WDTCTRL_STATUS), > + 0, WDTST_TIMEOUT); > + > + return ret; > +} > + > +static int __uniphier_watchdog_start(struct regmap *regmap, unsigned int sec) > +{ > + unsigned int val; > + int ret; > + > + ret = regmap_read_poll_timeout(regmap, WDTCTRL, val, > + !(val & WDTCTRL_STATUS), > + 0, WDTST_TIMEOUT); > + if (ret) > + return ret; > + > + /* Setup period */ > + ret = regmap_write(regmap, WDTTIMSET, > + SEC_TO_WDTTIMSET_PRD(sec)); > + if (ret) > + return ret; > + > + /* Enable and clear watchdog */ > + ret = regmap_write(regmap, WDTCTRL, WDTCTRL_ENABLE | WDTCTRL_CLEAR); > + if (!ret) > + /* > + * As SoC specification, after clear counter, > + * it needs to wait until counter status is 1. > + */ > + ret = regmap_read_poll_timeout(regmap, WDTCTRL, val, > + (val & WDTCTRL_STATUS), > + 0, WDTST_TIMEOUT); > + > + return ret; > +} > + > +static int __uniphier_watchdog_stop(struct regmap *regmap) > +{ > + /* Disable and stop watchdog */ > + return regmap_write_bits(regmap, WDTCTRL, WDTCTRL_ENABLE, 0); > +} > + > +static int __uniphier_watchdog_restart(struct regmap *regmap, unsigned int sec) > +{ > + int ret; > + > + ret = __uniphier_watchdog_stop(regmap); > + if (ret) > + return ret; > + > + return __uniphier_watchdog_start(regmap, sec); > +} > + > +static int uniphier_watchdog_start(struct watchdog_device *w) > +{ > + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); > + unsigned int tmp_timeout; > + > + tmp_timeout = roundup_pow_of_two(w->timeout); > + > + return __uniphier_watchdog_start(wdev->regmap, tmp_timeout); > +} > + > +static int uniphier_watchdog_stop(struct watchdog_device *w) > +{ > + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); > + > + return __uniphier_watchdog_stop(wdev->regmap); > +} > + > +static int uniphier_watchdog_set_timeout(struct watchdog_device *w, > + unsigned int t) > +{ > + struct uniphier_wdt_dev *wdev = watchdog_get_drvdata(w); > + unsigned int tmp_timeout; > + int ret; > + > + tmp_timeout = roundup_pow_of_two(t); > + if (tmp_timeout == w->timeout) > + return 0; > + > + if (watchdog_active(w)) { > + ret = __uniphier_watchdog_restart(wdev->regmap, tmp_timeout); > + if (ret) > + return ret; > + } > + > + w->timeout = tmp_timeout; > + > + return 0; > +} > + > +/* > + * Kernel Interfaces > + */ > +static const struct watchdog_info uniphier_wdt_info = { > + .identity = "uniphier-wdt", > + .options = WDIOF_SETTIMEOUT | > + WDIOF_KEEPALIVEPING | > + WDIOF_MAGICCLOSE | > + WDIOF_OVERHEAT, > +}; > + > +static const struct watchdog_ops uniphier_wdt_ops = { > + .owner = THIS_MODULE, > + .start = uniphier_watchdog_start, > + .stop = uniphier_watchdog_stop, > + .ping = uniphier_watchdog_ping, > + .set_timeout = uniphier_watchdog_set_timeout, > +}; > + > +static int uniphier_wdt_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct uniphier_wdt_dev *wdev; > + struct regmap *regmap; > + struct device_node *parent; > + int ret; > + > + wdev = devm_kzalloc(dev, sizeof(*wdev), GFP_KERNEL); > + if (!wdev) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, wdev); > + > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */ > + regmap = syscon_node_to_regmap(parent); > + of_node_put(parent); > + if (IS_ERR(regmap)) > + return PTR_ERR(regmap); > + > + wdev->regmap = regmap; > + wdev->wdt_dev.info = &uniphier_wdt_info; > + wdev->wdt_dev.ops = &uniphier_wdt_ops; > + wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX; > + wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN; > + wdev->wdt_dev.parent = dev; > + > + if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) { > + wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT; > + } > + watchdog_set_nowayout(&wdev->wdt_dev, nowayout); > + watchdog_stop_on_reboot(&wdev->wdt_dev); > + > + watchdog_set_drvdata(&wdev->wdt_dev, wdev); > + > + uniphier_watchdog_stop(&wdev->wdt_dev); > + ret = regmap_write(wdev->regmap, WDTRSTSEL, WDTRSTSEL_RSTSEL_BOTH); > + if (ret) > + return ret; > + > + ret = devm_watchdog_register_device(dev, &wdev->wdt_dev); > + if (ret) > + return ret; > + > + dev_info(dev, "watchdog driver (timeout=%d sec, nowayout=%d)\n", > + wdev->wdt_dev.timeout, nowayout); > + > + return 0; > +} > + > +static const struct of_device_id uniphier_wdt_dt_ids[] = { > + { .compatible = "socionext,uniphier-wdt" }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, uniphier_wdt_dt_ids); > + > +static struct platform_driver uniphier_wdt_driver = { > + .probe = uniphier_wdt_probe, > + .driver = { > + .name = "uniphier-wdt", > + .of_match_table = uniphier_wdt_dt_ids, > + }, > +}; > + > +module_platform_driver(uniphier_wdt_driver); > + > +module_param(timeout, uint, 0000); > +MODULE_PARM_DESC(timeout, > + "Watchdog timeout seconds in power of 2. (0 < timeout < 128, default=" > + __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); > + > +module_param(nowayout, bool, 0000); > +MODULE_PARM_DESC(nowayout, > + "Watchdog cannot be stopped once started (default=" > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); > + > +MODULE_AUTHOR("Keiji Hayashibara <hayashibara.keiji@socionext.com>"); > +MODULE_DESCRIPTION("UniPhier Watchdog Device Driver"); > +MODULE_LICENSE("GPL v2"); > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH V4 3/3] arm64: dts: uniphier: add watchdog node for LD11 and LD20 @ 2017-06-14 7:53 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim, linux Cc: linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, yamada.masahiro, hayashi.kunihiko, owada.kiyoshi, Keiji Hayashibara Add nodes of watchdog timer for UniPhier LD11 and LD20 SoC. The watchdog timer is included in sysctrl. Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> --- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 ++++ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index da881f5..5fee3e3 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -393,6 +393,10 @@ compatible = "socionext,uniphier-ld11-reset"; #reset-cells = <1>; }; + + watchdog { + compatible = "socionext,uniphier-wdt"; + }; }; }; }; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index a6b3a70..d4d82c8 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -417,6 +417,10 @@ compatible = "socionext,uniphier-ld20-reset"; #reset-cells = <1>; }; + + watchdog { + compatible = "socionext,uniphier-wdt"; + }; }; }; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH V4 3/3] arm64: dts: uniphier: add watchdog node for LD11 and LD20 @ 2017-06-14 7:53 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-06-14 7:53 UTC (permalink / raw) To: wim-IQzOog9fTRqzQB+pC5nmwQ, linux-0h96xk9xTtrk1uMJSBkQmQ Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA, masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A, jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A, yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A, hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A, owada.kiyoshi-uWyLwvC0a2jby3iVrkZq2A, Keiji Hayashibara Add nodes of watchdog timer for UniPhier LD11 and LD20 SoC. The watchdog timer is included in sysctrl. Signed-off-by: Keiji Hayashibara <hayashibara.keiji-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org> --- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 ++++ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index da881f5..5fee3e3 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -393,6 +393,10 @@ compatible = "socionext,uniphier-ld11-reset"; #reset-cells = <1>; }; + + watchdog { + compatible = "socionext,uniphier-wdt"; + }; }; }; }; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index a6b3a70..d4d82c8 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -417,6 +417,10 @@ compatible = "socionext,uniphier-ld20-reset"; #reset-cells = <1>; }; + + watchdog { + compatible = "socionext,uniphier-wdt"; + }; }; }; }; -- 2.7.4 -- 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 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH V4 3/3] arm64: dts: uniphier: add watchdog node for LD11 and LD20 2017-06-14 7:53 ` Keiji Hayashibara (?) @ 2017-07-16 3:26 ` Masahiro Yamada -1 siblings, 0 replies; 17+ messages in thread From: Masahiro Yamada @ 2017-07-16 3:26 UTC (permalink / raw) To: Keiji Hayashibara Cc: wim, Guenter Roeck, linux-watchdog, Linux Kernel Mailing List, Rob Herring, devicetree, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi, Kiyoshi Owada 2017-06-14 16:53 GMT+09:00 Keiji Hayashibara <hayashibara.keiji@socionext.com>: > Add nodes of watchdog timer for UniPhier LD11 and LD20 SoC. > The watchdog timer is included in sysctrl. > > Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> Applied to linux-uniphier. Thanks! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH V4 0/3] add UniPhier watchdog support @ 2017-07-05 10:06 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-07-05 10:06 UTC (permalink / raw) To: wim, linux Cc: linux-watchdog, linux-kernel, robh+dt, devicetree, masami.hiramatsu, jaswinder.singh, Yamada, Masahiro/山田 真弘, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 Hi Guenter, Let me confirm if I got it. I guess that this series finished the review. Could you tell me the current state of this series? ---------- Best Regards, Keiji Hayashibara > -----Original Message----- > From: Keiji Hayashibara [mailto:hayashibara.keiji@socionext.com] > Sent: Wednesday, June 14, 2017 4:54 PM > Subject: [PATCH V4 0/3] add UniPhier watchdog support > > This series adds support for watchdog timer implemented on UniPhier LD11 and > LD20 SoCs. This driver supports watchdog and system reset for SoCs. > > patch V3 > http://www.spinics.net/lists/linux-watchdog/msg11889.html > > patch V2 > http://www.spinics.net/lists/linux-watchdog/msg11852.html > > patch V1 > http://www.spinics.net/lists/linux-watchdog/msg11782.html > > > Changes between V4 and V3 > ========================= > > * Add own dependencies to Kconfig. > > Changes between V3 and V2 > ========================= > > * Make it possible to take a timeout from devicetree. > * Sort #include headlers alphabetically. > * Correct the description of dt-bindings document and this patch comment. > * Correct the description of license as GPLv2. > * Correct MODULE_AUTHOR() > * Remove unnecessary code. > > Changes between V2 and V1 > ========================= > 1. Add barrier code in uniphier_watchdog_ping() and __uniphier_watchdog_start(). > 2. Fix issues according to review comments. > > Keiji Hayashibara (3): > dt-bindings: watchdog: add description for UniPhier WDT controller > watchdog: uniphier: add UniPhier watchdog driver > arm64: dts: uniphier: add watchdog node for LD11 and LD20 > > .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++ > Documentation/watchdog/watchdog-parameters.txt | 6 + > arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 + > arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 + > drivers/watchdog/Kconfig | 12 + > drivers/watchdog/Makefile | 1 + > drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++ > 7 files changed, 315 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt > create mode 100644 drivers/watchdog/uniphier_wdt.c > > -- > 2.7.4 ^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH V4 0/3] add UniPhier watchdog support @ 2017-07-05 10:06 ` Keiji Hayashibara 0 siblings, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-07-05 10:06 UTC (permalink / raw) To: wim-IQzOog9fTRqzQB+pC5nmwQ, linux-0h96xk9xTtrk1uMJSBkQmQ Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA, masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A, jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A, Yamada, Masahiro/山田 真弘, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 Hi Guenter, Let me confirm if I got it. I guess that this series finished the review. Could you tell me the current state of this series? ---------- Best Regards, Keiji Hayashibara > -----Original Message----- > From: Keiji Hayashibara [mailto:hayashibara.keiji-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org] > Sent: Wednesday, June 14, 2017 4:54 PM > Subject: [PATCH V4 0/3] add UniPhier watchdog support > > This series adds support for watchdog timer implemented on UniPhier LD11 and > LD20 SoCs. This driver supports watchdog and system reset for SoCs. > > patch V3 > http://www.spinics.net/lists/linux-watchdog/msg11889.html > > patch V2 > http://www.spinics.net/lists/linux-watchdog/msg11852.html > > patch V1 > http://www.spinics.net/lists/linux-watchdog/msg11782.html > > > Changes between V4 and V3 > ========================= > > * Add own dependencies to Kconfig. > > Changes between V3 and V2 > ========================= > > * Make it possible to take a timeout from devicetree. > * Sort #include headlers alphabetically. > * Correct the description of dt-bindings document and this patch comment. > * Correct the description of license as GPLv2. > * Correct MODULE_AUTHOR() > * Remove unnecessary code. > > Changes between V2 and V1 > ========================= > 1. Add barrier code in uniphier_watchdog_ping() and __uniphier_watchdog_start(). > 2. Fix issues according to review comments. > > Keiji Hayashibara (3): > dt-bindings: watchdog: add description for UniPhier WDT controller > watchdog: uniphier: add UniPhier watchdog driver > arm64: dts: uniphier: add watchdog node for LD11 and LD20 > > .../devicetree/bindings/watchdog/uniphier-wdt.txt | 20 ++ > Documentation/watchdog/watchdog-parameters.txt | 6 + > arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 + > arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 + > drivers/watchdog/Kconfig | 12 + > drivers/watchdog/Makefile | 1 + > drivers/watchdog/uniphier_wdt.c | 268 +++++++++++++++++++++ > 7 files changed, 315 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/uniphier-wdt.txt > create mode 100644 drivers/watchdog/uniphier_wdt.c > > -- > 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V4 0/3] add UniPhier watchdog support 2017-07-05 10:06 ` Keiji Hayashibara (?) @ 2017-07-05 10:26 ` Masahiro Yamada 2017-07-05 15:25 ` Guenter Roeck -1 siblings, 1 reply; 17+ messages in thread From: Masahiro Yamada @ 2017-07-05 10:26 UTC (permalink / raw) To: Keiji Hayashibara Cc: wim, Guenter Roeck, linux-watchdog, Linux Kernel Mailing List, Rob Herring, devicetree, Masami Hiramatsu, Jassi Brar, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 2017-07-05 19:06 GMT+09:00 Keiji Hayashibara <hayashibara.keiji@socionext.com>: > Hi Guenter, > > Let me confirm if I got it. > > I guess that this series finished the review. > Could you tell me the current state of this series? I will pick up 3/3. (It should have been sent to ARM-SoC ML, though.) I had sent my PRs for v4.13 before Rob acked the DT binding. Please look forward to v4.14. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V4 0/3] add UniPhier watchdog support 2017-07-05 10:26 ` Masahiro Yamada @ 2017-07-05 15:25 ` Guenter Roeck 2017-07-06 4:06 ` Keiji Hayashibara 2017-07-06 13:01 ` Wim Van Sebroeck 0 siblings, 2 replies; 17+ messages in thread From: Guenter Roeck @ 2017-07-05 15:25 UTC (permalink / raw) To: Masahiro Yamada, Keiji Hayashibara Cc: wim, linux-watchdog, Linux Kernel Mailing List, Rob Herring, devicetree, Masami Hiramatsu, Jassi Brar, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 On 07/05/2017 03:26 AM, Masahiro Yamada wrote: > 2017-07-05 19:06 GMT+09:00 Keiji Hayashibara <hayashibara.keiji@socionext.com>: >> Hi Guenter, >> >> Let me confirm if I got it. >> >> I guess that this series finished the review. >> Could you tell me the current state of this series? > > > I will pick up 3/3. (It should have been sent to ARM-SoC ML, though.) > > I had sent my PRs for v4.13 before Rob acked the DT binding. > Please look forward to v4.14. > 1/3 and 2/3 are in -next, so they should be be included in Wim's pull request for 4.13. Guenter ^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH V4 0/3] add UniPhier watchdog support 2017-07-05 15:25 ` Guenter Roeck @ 2017-07-06 4:06 ` Keiji Hayashibara 2017-07-06 13:01 ` Wim Van Sebroeck 1 sibling, 0 replies; 17+ messages in thread From: Keiji Hayashibara @ 2017-07-06 4:06 UTC (permalink / raw) To: 'Guenter Roeck', Yamada, Masahiro/山田 真弘 Cc: wim, linux-watchdog, Linux Kernel Mailing List, Rob Herring, devicetree, Masami Hiramatsu, Jassi Brar, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 Hi Guenter and Yamada-san, I am grateful for your support. Thank you. ---------- Best Regards, Keiji Hayashibara > From: Guenter Roeck [mailto:linux@roeck-us.net] > Sent: Thursday, July 06, 2017 12:26 AM > Subject: Re: [PATCH V4 0/3] add UniPhier watchdog support > > On 07/05/2017 03:26 AM, Masahiro Yamada wrote: > > 2017-07-05 19:06 GMT+09:00 Keiji Hayashibara <hayashibara.keiji@socionext.com>: > >> Hi Guenter, > >> > >> Let me confirm if I got it. > >> > >> I guess that this series finished the review. > >> Could you tell me the current state of this series? > > > > > > I will pick up 3/3. (It should have been sent to ARM-SoC ML, though.) > > > > I had sent my PRs for v4.13 before Rob acked the DT binding. > > Please look forward to v4.14. > > > > 1/3 and 2/3 are in -next, so they should be be included in Wim's pull request > for 4.13. > > Guenter ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V4 0/3] add UniPhier watchdog support @ 2017-07-06 13:01 ` Wim Van Sebroeck 0 siblings, 0 replies; 17+ messages in thread From: Wim Van Sebroeck @ 2017-07-06 13:01 UTC (permalink / raw) To: Guenter Roeck Cc: Masahiro Yamada, Keiji Hayashibara, linux-watchdog, Linux Kernel Mailing List, Rob Herring, devicetree, Masami Hiramatsu, Jassi Brar, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 Hi All, > On 07/05/2017 03:26 AM, Masahiro Yamada wrote: > >2017-07-05 19:06 GMT+09:00 Keiji Hayashibara > ><hayashibara.keiji@socionext.com>: > >>Hi Guenter, > >> > >>Let me confirm if I got it. > >> > >>I guess that this series finished the review. > >>Could you tell me the current state of this series? > > > > > >I will pick up 3/3. (It should have been sent to ARM-SoC ML, though.) > > > >I had sent my PRs for v4.13 before Rob acked the DT binding. > >Please look forward to v4.14. > > > > 1/3 and 2/3 are in -next, so they should be be included in Wim's pull > request > for 4.13. That's correct. Kind regards, Wim. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH V4 0/3] add UniPhier watchdog support @ 2017-07-06 13:01 ` Wim Van Sebroeck 0 siblings, 0 replies; 17+ messages in thread From: Wim Van Sebroeck @ 2017-07-06 13:01 UTC (permalink / raw) To: Guenter Roeck Cc: Masahiro Yamada, Keiji Hayashibara, linux-watchdog-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, Rob Herring, devicetree-u79uwXL29TY76Z2rM5mHXA, Masami Hiramatsu, Jassi Brar, Hayashi, Kunihiko/林 邦彦, Owada, Kiyoshi/大和田 清志 Hi All, > On 07/05/2017 03:26 AM, Masahiro Yamada wrote: > >2017-07-05 19:06 GMT+09:00 Keiji Hayashibara > ><hayashibara.keiji-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>: > >>Hi Guenter, > >> > >>Let me confirm if I got it. > >> > >>I guess that this series finished the review. > >>Could you tell me the current state of this series? > > > > > >I will pick up 3/3. (It should have been sent to ARM-SoC ML, though.) > > > >I had sent my PRs for v4.13 before Rob acked the DT binding. > >Please look forward to v4.14. > > > > 1/3 and 2/3 are in -next, so they should be be included in Wim's pull > request > for 4.13. That's correct. Kind regards, Wim. -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2017-07-16 3:26 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-06-14 7:53 [PATCH V4 0/3] add UniPhier watchdog support Keiji Hayashibara 2017-06-14 7:53 ` Keiji Hayashibara 2017-06-14 7:53 ` [PATCH V4 1/3] dt-bindings: watchdog: add description for UniPhier WDT controller Keiji Hayashibara 2017-06-18 14:05 ` Rob Herring 2017-06-20 20:55 ` Guenter Roeck 2017-06-14 7:53 ` [PATCH V4 2/3] watchdog: uniphier: add UniPhier watchdog driver Keiji Hayashibara 2017-06-20 20:55 ` Guenter Roeck 2017-06-14 7:53 ` [PATCH V4 3/3] arm64: dts: uniphier: add watchdog node for LD11 and LD20 Keiji Hayashibara 2017-06-14 7:53 ` Keiji Hayashibara 2017-07-16 3:26 ` Masahiro Yamada 2017-07-05 10:06 ` [PATCH V4 0/3] add UniPhier watchdog support Keiji Hayashibara 2017-07-05 10:06 ` Keiji Hayashibara 2017-07-05 10:26 ` Masahiro Yamada 2017-07-05 15:25 ` Guenter Roeck 2017-07-06 4:06 ` Keiji Hayashibara 2017-07-06 13:01 ` Wim Van Sebroeck 2017-07-06 13:01 ` Wim Van Sebroeck
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.