* [PATCH 1/3] MIPS: Ci20: Enable watchdog driver @ 2017-09-08 18:35 Mathieu Malaterre 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre 2017-09-08 18:35 ` [PATCH 3/3] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree Mathieu Malaterre 0 siblings, 2 replies; 9+ messages in thread From: Mathieu Malaterre @ 2017-09-08 18:35 UTC (permalink / raw) Cc: Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Wim Van Sebroeck, Guenter Roeck, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog Update the Ci20's defconfig to enable the JZ4740's watchdog driver. Signed-off-by: Mathieu Malaterre <malat@debian.org> --- arch/mips/configs/ci20_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/configs/ci20_defconfig b/arch/mips/configs/ci20_defconfig index b42cfa7865f9..459b21e6278d 100644 --- a/arch/mips/configs/ci20_defconfig +++ b/arch/mips/configs/ci20_defconfig @@ -92,6 +92,8 @@ CONFIG_I2C=y CONFIG_I2C_JZ4780=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_JZ4740_WDT=y CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-09-08 18:35 [PATCH 1/3] MIPS: Ci20: Enable watchdog driver Mathieu Malaterre @ 2017-09-08 18:35 ` Mathieu Malaterre 2017-09-09 1:32 ` Guenter Roeck ` (2 more replies) 2017-09-08 18:35 ` [PATCH 3/3] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree Mathieu Malaterre 1 sibling, 3 replies; 9+ messages in thread From: Mathieu Malaterre @ 2017-09-08 18:35 UTC (permalink / raw) Cc: Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Wim Van Sebroeck, Guenter Roeck, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog This driver works for jz4740 & jz4780 Suggested-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Mathieu Malaterre <malat@debian.org> --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c722cbfdc7e6..ca200d1f310a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1460,7 +1460,7 @@ config INDYDOG config JZ4740_WDT tristate "Ingenic jz4740 SoC hardware watchdog" - depends on MACH_JZ4740 + depends on MACH_JZ4740 || MACH_JZ4780 select WATCHDOG_CORE help Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs. -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre @ 2017-09-09 1:32 ` Guenter Roeck 2017-09-15 19:18 ` [PATCH v2 2/5] " Mathieu Malaterre 2017-11-09 7:47 ` [PATCH 2/3] " James Hogan 2 siblings, 0 replies; 9+ messages in thread From: Guenter Roeck @ 2017-09-09 1:32 UTC (permalink / raw) To: Mathieu Malaterre Cc: Rob Herring, Mark Rutland, Ralf Baechle, Wim Van Sebroeck, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog On 09/08/2017 11:35 AM, Mathieu Malaterre wrote: > This driver works for jz4740 & jz4780 > > Suggested-by: Maarten ter Huurne <maarten@treewalker.org> > Signed-off-by: Mathieu Malaterre <malat@debian.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index c722cbfdc7e6..ca200d1f310a 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1460,7 +1460,7 @@ config INDYDOG > > config JZ4740_WDT > tristate "Ingenic jz4740 SoC hardware watchdog" > - depends on MACH_JZ4740 > + depends on MACH_JZ4740 || MACH_JZ4780 > select WATCHDOG_CORE > help > Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs. > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/5] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre 2017-09-09 1:32 ` Guenter Roeck @ 2017-09-15 19:18 ` Mathieu Malaterre 2017-11-09 7:47 ` [PATCH 2/3] " James Hogan 2 siblings, 0 replies; 9+ messages in thread From: Mathieu Malaterre @ 2017-09-15 19:18 UTC (permalink / raw) Cc: Mathieu Malaterre, Wim Van Sebroeck, Guenter Roeck, linux-watchdog, linux-kernel This driver works for jz4740 & jz4780 Suggested-by: Maarten ter Huurne <maarten@treewalker.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Mathieu Malaterre <malat@debian.org> --- Changes in v2: * none drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c722cbfdc7e6..ca200d1f310a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1460,7 +1460,7 @@ config INDYDOG config JZ4740_WDT tristate "Ingenic jz4740 SoC hardware watchdog" - depends on MACH_JZ4740 + depends on MACH_JZ4740 || MACH_JZ4780 select WATCHDOG_CORE help Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs. -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre 2017-09-09 1:32 ` Guenter Roeck 2017-09-15 19:18 ` [PATCH v2 2/5] " Mathieu Malaterre @ 2017-11-09 7:47 ` James Hogan 2017-11-09 16:01 ` Guenter Roeck 2 siblings, 1 reply; 9+ messages in thread From: James Hogan @ 2017-11-09 7:47 UTC (permalink / raw) To: Wim Van Sebroeck Cc: Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Guenter Roeck, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog [-- Attachment #1: Type: text/plain, Size: 1161 bytes --] Hi Wim, On Fri, Sep 08, 2017 at 08:35:54PM +0200, Mathieu Malaterre wrote: > This driver works for jz4740 & jz4780 > > Suggested-by: Maarten ter Huurne <maarten@treewalker.org> > Signed-off-by: Mathieu Malaterre <malat@debian.org> I just noticed that though Ralf applied the other two patches in this series (defconfig + dt), he hadn't applied this patch. Please can we have an ack from a watchdog maintainer so this can get into 4.15 via the MIPS tree? It could alternatively go via the watchdog tree if you prefer. Thanks James > --- > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index c722cbfdc7e6..ca200d1f310a 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1460,7 +1460,7 @@ config INDYDOG > > config JZ4740_WDT > tristate "Ingenic jz4740 SoC hardware watchdog" > - depends on MACH_JZ4740 > + depends on MACH_JZ4740 || MACH_JZ4780 > select WATCHDOG_CORE > help > Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs. > -- > 2.11.0 > > [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-11-09 7:47 ` [PATCH 2/3] " James Hogan @ 2017-11-09 16:01 ` Guenter Roeck 2017-11-09 16:43 ` James Hogan 0 siblings, 1 reply; 9+ messages in thread From: Guenter Roeck @ 2017-11-09 16:01 UTC (permalink / raw) To: James Hogan Cc: Wim Van Sebroeck, Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog On Thu, Nov 09, 2017 at 07:47:19AM +0000, James Hogan wrote: > Hi Wim, > > On Fri, Sep 08, 2017 at 08:35:54PM +0200, Mathieu Malaterre wrote: > > This driver works for jz4740 & jz4780 > > > > Suggested-by: Maarten ter Huurne <maarten@treewalker.org> > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > > I just noticed that though Ralf applied the other two patches in this > series (defconfig + dt), he hadn't applied this patch. > > Please can we have an ack from a watchdog maintainer so this can get > into 4.15 via the MIPS tree? It could alternatively go via the watchdog > tree if you prefer. > FWIW, according to my logs I did send out a Reviewed-by: some time ago, which normally means that I expect it to go through the watchdog tree. I wasn't aware that you wanted the patch to go through the mips tree. Sorry if I missed that earlier. For the record, Acked-by: Guenter Roeck <linux@roeck-us.net> since I don't care one way or another. I assume you want me to drop this and the related patches from my own watchdpog-next tree to prevent it from showing up in Wim's tree (if it isn't already there). Is that correct ? Guenter > Thanks > James > > > --- > > drivers/watchdog/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > > index c722cbfdc7e6..ca200d1f310a 100644 > > --- a/drivers/watchdog/Kconfig > > +++ b/drivers/watchdog/Kconfig > > @@ -1460,7 +1460,7 @@ config INDYDOG > > > > config JZ4740_WDT > > tristate "Ingenic jz4740 SoC hardware watchdog" > > - depends on MACH_JZ4740 > > + depends on MACH_JZ4740 || MACH_JZ4780 > > select WATCHDOG_CORE > > help > > Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs. > > -- > > 2.11.0 > > > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-11-09 16:01 ` Guenter Roeck @ 2017-11-09 16:43 ` James Hogan 2017-11-09 16:57 ` Guenter Roeck 0 siblings, 1 reply; 9+ messages in thread From: James Hogan @ 2017-11-09 16:43 UTC (permalink / raw) To: Guenter Roeck Cc: Wim Van Sebroeck, Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog [-- Attachment #1: Type: text/plain, Size: 1621 bytes --] On Thu, Nov 09, 2017 at 08:01:47AM -0800, Guenter Roeck wrote: > On Thu, Nov 09, 2017 at 07:47:19AM +0000, James Hogan wrote: > > Hi Wim, > > > > On Fri, Sep 08, 2017 at 08:35:54PM +0200, Mathieu Malaterre wrote: > > > This driver works for jz4740 & jz4780 > > > > > > Suggested-by: Maarten ter Huurne <maarten@treewalker.org> > > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > > > > I just noticed that though Ralf applied the other two patches in this > > series (defconfig + dt), he hadn't applied this patch. > > > > Please can we have an ack from a watchdog maintainer so this can get > > into 4.15 via the MIPS tree? It could alternatively go via the watchdog > > tree if you prefer. > > > > FWIW, according to my logs I did send out a Reviewed-by: some time ago, > which normally means that I expect it to go through the watchdog tree. > I wasn't aware that you wanted the patch to go through the mips tree. > Sorry if I missed that earlier. For the record, > > Acked-by: Guenter Roeck <linux@roeck-us.net> > > since I don't care one way or another. Okay thanks, I wasn't sure and don't much mind which way it goes. > > I assume you want me to drop this and the related patches from my own > watchdpog-next tree to prevent it from showing up in Wim's tree (if > it isn't already there). Is that correct ? I haven't seen this patch in linux-next, or I wouldn't have mentioned it. If its already in some staging tree for 4.15 that I've missed then it may as well stay there, otherwise I'll just take it through the MIPS tree with your ack. Cheers James [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver 2017-11-09 16:43 ` James Hogan @ 2017-11-09 16:57 ` Guenter Roeck 0 siblings, 0 replies; 9+ messages in thread From: Guenter Roeck @ 2017-11-09 16:57 UTC (permalink / raw) To: James Hogan Cc: Wim Van Sebroeck, Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Paul Cercueil, Linus Walleij, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog On Thu, Nov 09, 2017 at 04:43:43PM +0000, James Hogan wrote: > On Thu, Nov 09, 2017 at 08:01:47AM -0800, Guenter Roeck wrote: > > On Thu, Nov 09, 2017 at 07:47:19AM +0000, James Hogan wrote: > > > Hi Wim, > > > > > > On Fri, Sep 08, 2017 at 08:35:54PM +0200, Mathieu Malaterre wrote: > > > > This driver works for jz4740 & jz4780 > > > > > > > > Suggested-by: Maarten ter Huurne <maarten@treewalker.org> > > > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > > > > > > I just noticed that though Ralf applied the other two patches in this > > > series (defconfig + dt), he hadn't applied this patch. > > > > > > Please can we have an ack from a watchdog maintainer so this can get > > > into 4.15 via the MIPS tree? It could alternatively go via the watchdog > > > tree if you prefer. > > > > > > > FWIW, according to my logs I did send out a Reviewed-by: some time ago, > > which normally means that I expect it to go through the watchdog tree. > > I wasn't aware that you wanted the patch to go through the mips tree. > > Sorry if I missed that earlier. For the record, > > > > Acked-by: Guenter Roeck <linux@roeck-us.net> > > > > since I don't care one way or another. > > Okay thanks, I wasn't sure and don't much mind which way it goes. > > > > > I assume you want me to drop this and the related patches from my own > > watchdpog-next tree to prevent it from showing up in Wim's tree (if > > it isn't already there). Is that correct ? > > I haven't seen this patch in linux-next, or I wouldn't have mentioned > it. If its already in some staging tree for 4.15 that I've missed then > it may as well stay there, otherwise I'll just take it through the MIPS > tree with your ack. > Looks like none of the patches I reviewed since the last release cycle made it into watchdog-next, meaning they might all miss the next release. Guess Wim is busy. Nothing I can do there. Guenter ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree 2017-09-08 18:35 [PATCH 1/3] MIPS: Ci20: Enable watchdog driver Mathieu Malaterre 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre @ 2017-09-08 18:35 ` Mathieu Malaterre 1 sibling, 0 replies; 9+ messages in thread From: Mathieu Malaterre @ 2017-09-08 18:35 UTC (permalink / raw) Cc: Mathieu Malaterre, Rob Herring, Mark Rutland, Ralf Baechle, Wim Van Sebroeck, Guenter Roeck, Linus Walleij, Paul Cercueil, Krzysztof Kozlowski, devicetree, linux-mips, linux-kernel, linux-watchdog The jz4740-watchdog driver supports both jz4740 & jz4780. Signed-off-by: Mathieu Malaterre <malat@debian.org> --- arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi index 4853ef67b3ab..33d7f49186d6 100644 --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi @@ -207,6 +207,11 @@ status = "disabled"; }; + watchdog: jz4780-watchdog@10002000 { + compatible = "ingenic,jz4740-watchdog"; + reg = <0x10002000 0x100>; + }; + nemc: nemc@13410000 { compatible = "ingenic,jz4780-nemc"; reg = <0x13410000 0x10000>; -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-11-09 16:57 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-09-08 18:35 [PATCH 1/3] MIPS: Ci20: Enable watchdog driver Mathieu Malaterre 2017-09-08 18:35 ` [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver Mathieu Malaterre 2017-09-09 1:32 ` Guenter Roeck 2017-09-15 19:18 ` [PATCH v2 2/5] " Mathieu Malaterre 2017-11-09 7:47 ` [PATCH 2/3] " James Hogan 2017-11-09 16:01 ` Guenter Roeck 2017-11-09 16:43 ` James Hogan 2017-11-09 16:57 ` Guenter Roeck 2017-09-08 18:35 ` [PATCH 3/3] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree Mathieu Malaterre
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox