MIPS: Ci20: Enable watchdog driver

PATCH Superseded Mathieu Malaterre 4 participants 15 messages Sep 8, 2017 – Nov 9, 2017

Subsystems (4)

Device tree bindings MIPS Watchdog device drivers Ingenic JZ47xx SoCs

lore

Share & tools

lore

Mathieu Malaterre

author

2017-09-08 18:35 UTC #0 lore raw

PATCH 1/3 MIPS: Ci20: Enable watchdog driver

Update the Ci20's defconfig to enable the JZ4740's watchdog driver.

Signed-off-by Mathieu Malaterre <[email protected]>

---
 arch/mips/configs/ci20_defconfig | 2 ++
 1 file changed, 2 insertions(+)

arch/mips/configs/ci20_defconfig +2 -0

index b42cfa7865f9..459b21e6278d 100644
@@ -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

Signature · 6 lines

2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Mathieu Malaterre

author

2017-09-08 18:35 UTC #1 lore raw

PATCH 2/3 watchdog: jz4780: Allow selection of jz4740-wdt driver

This driver works for jz4740 & jz4780

Signed-off-by Mathieu Malaterre <[email protected]>

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +1 -1

index c722cbfdc7e6..ca200d1f310a 100644
@@ -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.

Signature · 1 line

2.11.0

Guenter Roeck

maintainer Reviewed-by on v1 2/3

2017-09-09 01:32 UTC #2 lore raw

Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver

Quoted 4 lines · Mathieu Malaterre

This driver works for jz4740 & jz4780
Suggested-by Maarten ter Huurne <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

Reviewed-by Guenter Roeck <[email protected]>

Quoted 18 lines

---
  drivers/watchdog/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +1 -1

index c722cbfdc7e6..ca200d1f310a 100644
@@ -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.

Mathieu Malaterre

author

2017-09-15 19:18 UTC #3 lore raw

PATCH v2 2/5 watchdog: jz4780: Allow selection of jz4740-wdt driver

In reply to Mathieu Malaterre

This driver works for jz4740 & jz4780

Reviewed-by Guenter Roeck <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
Changes in v2:
* none

 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +1 -1

index c722cbfdc7e6..ca200d1f310a 100644
@@ -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.

Signature · 1 line

2.11.0

James Hogan

2017-11-09 07:47 UTC #4 lore raw

Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver

In reply to Mathieu Malaterre

Hi Wim,

Quoted 4 lines · Mathieu Malaterre

This driver works for jz4740 & jz4780
Suggested-by Maarten ter Huurne <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

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

Quoted 21 lines

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +1 -1

index c722cbfdc7e6..ca200d1f310a 100644
@@ -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.

Signature · 1 line

2.11.0

Guenter Roeck

maintainer Acked-by

2017-11-09 16:01 UTC #5 lore raw

Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver

Quoted 8 lines · James Hogan

Hi Wim,
Quoted 4 lines · Mathieu Malaterre
This driver works for jz4740 & jz4780
Suggested-by Maarten ter Huurne <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

Quoted 7 lines

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 <[email protected]>

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

Quoted 13 lines

Thanks
James

Quoted 10 lines

---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/watchdog/Kconfig +0 -0

index c722cbfdc7e6..ca200d1f310a 100644
@@ -1460,7 +1460,7 @@ config INDYDOG

Quoted 11 lines

drivers/watchdog/Kconfig +1 -1

 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.

Signature · 1 line

2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

James Hogan

2017-11-09 16:43 UTC #6 lore raw

Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver

Quoted 17 lines · Guenter Roeck

Quoted 8 lines · James Hogan
Hi Wim,
Quoted 4 lines · Mathieu Malaterre
This driver works for jz4740 & jz4780
Suggested-by Maarten ter Huurne <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>
Quoted 7 lines
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.

Quoted 8 lines

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 <[email protected]>
since I don't care one way or another.

Okay thanks, I wasn't sure and don't much mind which way it goes.

Quoted 4 lines

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

Guenter Roeck

maintainer

2017-11-09 16:57 UTC #7 lore raw

Re: [PATCH 2/3] watchdog: jz4780: Allow selection of jz4740-wdt driver

Quoted 30 lines · James Hogan

Quoted 17 lines · Guenter Roeck
Quoted 8 lines · James Hogan
Hi Wim,
Quoted 4 lines · Mathieu Malaterre
This driver works for jz4740 & jz4780
Suggested-by Maarten ter Huurne <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>
Quoted 7 lines
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.
Quoted 8 lines
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 <[email protected]>
since I don't care one way or another.
Okay thanks, I wasn't sure and don't much mind which way it goes.
Quoted 1 line

Quoted 9 lines

Quoted 3 lines
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Mathieu Malaterre

author

2017-09-08 18:35 UTC #8 lore raw

PATCH 3/3 MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

In reply to Mathieu Malaterre

The jz4740-watchdog driver supports both jz4740 & jz4780.

Signed-off-by Mathieu Malaterre <[email protected]>

---
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

arch/mips/boot/dts/ingenic/jz4780.dtsi +5 -0

index 4853ef67b3ab..33d7f49186d6 100644
@@ -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>;

Signature · 1 line

2.11.0

Mathieu Malaterre

author

2017-09-15 19:18 UTC #9 lore raw

PATCH v2 3/5 MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

The jz4740-watchdog driver supports both jz4740 & jz4780.

Signed-off-by Mathieu Malaterre <[email protected]>

---
Changes in v2:
* make the node name generic (Paul Cercueil)

 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

arch/mips/boot/dts/ingenic/jz4780.dtsi +5 -0

index 20e37d2d6008..76055bbc823a 100644
@@ -263,6 +263,11 @@
 		status = "disabled";
 	};
 
+	watchdog: watchdog@10002000 {
+		compatible = "ingenic,jz4780-watchdog";
+		reg = <0x10002000 0x100>;
+	};
+
 	nemc: nemc@13410000 {
 		compatible = "ingenic,jz4780-nemc";
 		reg = <0x13410000 0x10000>;

Signature · 6 lines

2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

PrasannaKumar Muralidharan

2017-09-26 13:17 UTC #10 lore raw

Re: [PATCH v2 3/5] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

Hi Mathieu,

Quoted 15 lines · Mathieu Malaterre

The jz4740-watchdog driver supports both jz4740 & jz4780.
Signed-off-by Mathieu Malaterre <[email protected]>
---
Changes in v2:
* make the node name generic (Paul Cercueil)
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -0
index 20e37d2d6008..76055bbc823a 100644

arch/mips/boot/dts/ingenic/jz4780.dtsi line 267

Quoted 5 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi +2 -0

@@ -263,6 +263,11 @@
                status = "disabled";
        };
 
+       watchdog: watchdog@10002000 {
+               compatible = "ingenic,jz4780-watchdog";

In drivers/watchdog/jz4740_wdt.c the compatible is declared as "ingenic,jz4740-watchdog" while your change says "ingenic,jz4780-watchdog". Can you modify that?

arch/mips/boot/dts/ingenic/jz4780.dtsi line 270

Quoted 3 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi +3 -0
+               reg = <0x10002000 0x100>;
+       };
+

The structures jz4740_wdt_device and jz4740_wdt_resources can be removed form arch/mips/jz4740/platform.c as watchdog is declared in device tree. For JZ4740 platform watchdog is not used so the variables can be removed.

Do you mind adding watchdog entry to JZ4740 device tree? Currently watchdog is not enabled for JZ4740 platform.

Quoted 6 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -1

        nemc: nemc@13410000 {
                compatible = "ingenic,jz4780-nemc";
                reg = <0x13410000 0x10000>;
--

2.11.0

Regards,
PrasannaKumar
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Mathieu Malaterre

author

2017-09-26 13:26 UTC #11 lore raw

Re: [PATCH v2 3/5] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

Hi PrasannaKumar !

Quoted 21 lines · PrasannaKumar Muralidharan

Hi Mathieu,
Quoted 18 lines · Mathieu Malaterre
The jz4740-watchdog driver supports both jz4740 & jz4780.
Signed-off-by Mathieu Malaterre <[email protected]>
---
Changes in v2:
* make the node name generic (Paul Cercueil)
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -0
index 20e37d2d6008..76055bbc823a 100644
@@ -263,6 +263,11 @@
                status = "disabled";
        };
 

Quoted 6 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi line 267
Quoted 2 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi +2 -0
+       watchdog: watchdog@10002000 {
+               compatible = "ingenic,jz4780-watchdog";
In drivers/watchdog/jz4740_wdt.c the compatible is declared as "ingenic,jz4740-watchdog" while your change says "ingenic,jz4780-watchdog". Can you modify that?

Well in the full changeset, you'll find: [PATCH v2 4/5] watchdog:
jz4740: Add support for the watchdog in jz4780 SoC

https://lkml.org/lkml/2017/9/15/451

There has been some misunderstanding. I still believe I need a new compatible string, even if currently the code is 100% identical.

Quoted 11 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi line 270
Quoted 3 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi +3 -0
+               reg = <0x10002000 0x100>;
+       };
+
The structures jz4740_wdt_device and jz4740_wdt_resources can be removed form arch/mips/jz4740/platform.c as watchdog is declared in device tree. For JZ4740 platform watchdog is not used so the variables can be removed.
Do you mind adding watchdog entry to JZ4740 device tree? Currently watchdog is not enabled for JZ4740 platform.

Will do once this series has been accepted. Thanks for the review !

Quoted 9 lines

Quoted 6 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -1

        nemc: nemc@13410000 {
                compatible = "ingenic,jz4780-nemc";
                reg = <0x13410000 0x10000>;
--

2.11.0

Regards,
PrasannaKumar

PrasannaKumar Muralidharan

Reviewed-by

2017-09-26 13:59 UTC #12 lore raw

Re: [PATCH v2 3/5] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

Quoted 32 lines · Mathieu Malaterre

Hi PrasannaKumar !
Quoted 21 lines · PrasannaKumar Muralidharan
Hi Mathieu,
Quoted 18 lines · Mathieu Malaterre
The jz4740-watchdog driver supports both jz4740 & jz4780.
Signed-off-by Mathieu Malaterre <[email protected]>
---
Changes in v2:
* make the node name generic (Paul Cercueil)
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -0
index 20e37d2d6008..76055bbc823a 100644
@@ -263,6 +263,11 @@
                status = "disabled";
        };
 
Quoted 6 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi line 267
Quoted 2 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi +2 -0
+       watchdog: watchdog@10002000 {
+               compatible = "ingenic,jz4780-watchdog";
In drivers/watchdog/jz4740_wdt.c the compatible is declared as "ingenic,jz4740-watchdog" while your change says "ingenic,jz4780-watchdog". Can you modify that?

Quoted 7 lines

Well in the full changeset, you'll find: [PATCH v2 4/5] watchdog:
jz4740: Add support for the watchdog in jz4780 SoC
https://lkml.org/lkml/2017/9/15/451
There has been some misunderstanding. I still believe I need a new compatible string, even if currently the code is 100% identical.

I missed that. Ignore this comment.

Quoted 10 lines

Quoted 10 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi line 270
Quoted 4 lines
arch/mips/boot/dts/ingenic/jz4780.dtsi +3 -0
+               reg = <0x10002000 0x100>;
+       };
+
The structures jz4740_wdt_device and jz4740_wdt_resources can be removed form arch/mips/jz4740/platform.c as watchdog is declared in device tree. For JZ4740 platform watchdog is not used so the variables can be removed.

Quoted 5 lines

Quoted 2 lines
Do you mind adding watchdog entry to JZ4740 device tree? Currently watchdog is not enabled for JZ4740 platform.
Will do once this series has been accepted. Thanks for the review !

Reviewed-by PrasannaKumar Muralidharan <[email protected]>

Quoted 10 lines

Quoted 7 lines

arch/mips/boot/dts/ingenic/jz4780.dtsi +0 -1

        nemc: nemc@13410000 {
                compatible = "ingenic,jz4780-nemc";
                reg = <0x13410000 0x10000>;
--

2.11.0

Regards,
PrasannaKumar

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Guenter Roeck

maintainer Acked-by on v1 3/3

2017-10-22 15:26 UTC #13 lore raw

Re: [3/3] MIPS: jz4780: DTS: Probe the jz4740-watchdog driver from devicetree

In reply to Mathieu Malaterre

Quoted 3 lines · Mathieu Malaterre

The jz4740-watchdog driver supports both jz4740 & jz4780.
Signed-off-by Mathieu Malaterre <[email protected]>

Acked-by Guenter Roeck <[email protected]>

Quoted 20 lines

---
 arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

arch/mips/boot/dts/ingenic/jz4780.dtsi +5 -0

index 4853ef67b3ab..33d7f49186d6 100644
@@ -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>;

Mathieu Malaterre

author

2017-09-15 19:18 UTC #14 lore raw

PATCH v2 1/5 MIPS: Ci20: Enable watchdog driver

In reply to Mathieu Malaterre

Update the Ci20's defconfig to enable the JZ4740's watchdog driver.

Signed-off-by Mathieu Malaterre <[email protected]>

---
Changes in v2:
* none

 arch/mips/configs/ci20_defconfig | 2 ++
 1 file changed, 2 insertions(+)

arch/mips/configs/ci20_defconfig +2 -0

index 19a8ebd1d374..ed8d3d2f63cf 100644
@@ -100,6 +100,8 @@ CONFIG_I2C_JZ4780=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_INGENIC=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

Signature · 1 line

2.11.0