Skip to contentSkip to conversation

watchdog: jz4740: Add support for the watchdog in jz4780 SoC

PATCH In review Mathieu Malaterre 2 participants 3 messages Sep 15, 2017 – Sep 18, 2017

Subsystems (2)
Watchdog device drivers Ingenic JZ47xx SoCs
lore
Share & tools
lore

Mathieu Malaterre

author
#0 lore raw

PATCH v2 4/5 watchdog: jz4740: Add support for the watchdog in jz4780 SoC

The watchdog unit present in the JZ4780 works the same as the one in the JZ4740.

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

---
Changes in v2:
* do not re-use the compatible string for different SoC (Paul Cercueil)

 drivers/watchdog/jz4740_wdt.c | 1 +
 1 file changed, 1 insertion(+)
drivers/watchdog/jz4740_wdt.c +1 -0
index 20627f22baf6..aafbeb96561b 100644
@@ -146,6 +146,7 @@ static const struct watchdog_ops jz4740_wdt_ops = {
 #ifdef CONFIG_OF
 static const struct of_device_id jz4740_wdt_of_matches[] = {
 	{ .compatible = "ingenic,jz4740-watchdog", },
+	{ .compatible = "ingenic,jz4780-watchdog", },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, jz4740_wdt_of_matches);
Signature · 1 line
2.11.0
maintainer
#1 lore raw
Quoted 7 lines · Mathieu Malaterre

The watchdog unit present in the JZ4780 works the same as the one in the JZ4740.

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

---
Changes in v2:
* do not re-use the compatible string for different SoC (Paul Cercueil)

I thought that was one of the specific features of compatible statements, to avoid having to change the driver each time a new chip comes along. Did that change recently ?

Guenter

Quoted 19 lines
 drivers/watchdog/jz4740_wdt.c | 1 +
 1 file changed, 1 insertion(+)
drivers/watchdog/jz4740_wdt.c +1 -0
index 20627f22baf6..aafbeb96561b 100644
@@ -146,6 +146,7 @@ static const struct watchdog_ops jz4740_wdt_ops = {
 #ifdef CONFIG_OF
 static const struct of_device_id jz4740_wdt_of_matches[] = {
 	{ .compatible = "ingenic,jz4740-watchdog", },
+	{ .compatible = "ingenic,jz4780-watchdog", },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, jz4740_wdt_of_matches);
Signature · 1 line
2.11.0
author
#2 lore raw
Quoted 4 lines · Guenter Roeck
Quoted 3 lines · Mathieu Malaterre

The watchdog unit present in the JZ4780 works the same as the one in the JZ4740.

Quoted 8 lines
Quoted 4 lines
Signed-off-by Mathieu Malaterre <[email protected]>

---
Changes in v2:
* do not re-use the compatible string for different SoC (Paul Cercueil)

I thought that was one of the specific features of compatible statements, to avoid having to change the driver each time a new chip comes along. Did that change recently ?

Well, this was suggested-by Paul Cercueil. This seems to make sense to have two different compatible strings for two different SoC (JZ4740 & JZ4780, technically there is also JZ4770). This also seems to be used in other drivers:

% grep -lroPz '(?s)ingenic,jz4740.*?ingenic,jz4780' * Documentation/devicetree/bindings/gpio/ingenic,gpio.txt Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt Documentation/devicetree/bindings/clock/ingenic,cgu.txt Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt Documentation/devicetree/bindings/serial/ingenic,uart.txt Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt drivers/gpio/gpio-ingenic.c drivers/pinctrl/pinctrl-ingenic.c drivers/tty/serial/8250/8250_ingenic.c drivers/rtc/rtc-jz4740.c
drivers/irqchip/irq-ingenic.c
sound/soc/jz4740/jz4740-i2s.c

Quoted 19 lines
Quoted 19 lines
 drivers/watchdog/jz4740_wdt.c | 1 +
 1 file changed, 1 insertion(+)
drivers/watchdog/jz4740_wdt.c +1 -1
index 20627f22baf6..aafbeb96561b 100644
@@ -146,6 +146,7 @@ static const struct watchdog_ops jz4740_wdt_ops = {
 #ifdef CONFIG_OF
 static const struct of_device_id jz4740_wdt_of_matches[] = {
      { .compatible = "ingenic,jz4740-watchdog", },
+     { .compatible = "ingenic,jz4780-watchdog", },
      { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, jz4740_wdt_of_matches);
--

2.11.0