Skip to content

Commit 11479e8

Browse files
pcercueipaulburton
authored andcommitted
MIPS: ingenic: DTS: Fix watchdog nodes
The devicetree ABI was broken on purpose by commit 6d53214 ("watchdog: jz4740: Use regmap provided by TCU driver"), and commit 1d9c307 ("watchdog: jz4740: Use WDT clock provided by TCU driver"). The commit message of the latter explains why the ABI was broken. However, the current devicetree files were not updated to the new ABI described in Documentation/devicetree/bindings/timer/ingenic,tcu.txt, so the watchdog driver would not probe. Fix this problem by updating the watchdog nodes to comply with the new ABI. Fixes: 6d53214 ("watchdog: jz4740: Use regmap provided by TCU driver") Signed-off-by: Paul Cercueil <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Paul Burton <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Rob Herring <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Zhou Yanjie <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: <[email protected]> # v5.5+
1 parent eb41113 commit 11479e8

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

arch/mips/boot/dts/ingenic/jz4740.dtsi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <dt-bindings/clock/jz4740-cgu.h>
3+
#include <dt-bindings/clock/ingenic,tcu.h>
34

45
/ {
56
#address-cells = <1>;
@@ -45,14 +46,6 @@
4546
#clock-cells = <1>;
4647
};
4748

48-
watchdog: watchdog@10002000 {
49-
compatible = "ingenic,jz4740-watchdog";
50-
reg = <0x10002000 0x10>;
51-
52-
clocks = <&cgu JZ4740_CLK_RTC>;
53-
clock-names = "rtc";
54-
};
55-
5649
tcu: timer@10002000 {
5750
compatible = "ingenic,jz4740-tcu", "simple-mfd";
5851
reg = <0x10002000 0x1000>;
@@ -73,6 +66,14 @@
7366

7467
interrupt-parent = <&intc>;
7568
interrupts = <23 22 21>;
69+
70+
watchdog: watchdog@0 {
71+
compatible = "ingenic,jz4740-watchdog";
72+
reg = <0x0 0xc>;
73+
74+
clocks = <&tcu TCU_CLK_WDT>;
75+
clock-names = "wdt";
76+
};
7677
};
7778

7879
rtc_dev: rtc@10003000 {

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <dt-bindings/clock/jz4780-cgu.h>
3+
#include <dt-bindings/clock/ingenic,tcu.h>
34
#include <dt-bindings/dma/jz4780-dma.h>
45

56
/ {
@@ -67,6 +68,14 @@
6768

6869
interrupt-parent = <&intc>;
6970
interrupts = <27 26 25>;
71+
72+
watchdog: watchdog@0 {
73+
compatible = "ingenic,jz4780-watchdog";
74+
reg = <0x0 0xc>;
75+
76+
clocks = <&tcu TCU_CLK_WDT>;
77+
clock-names = "wdt";
78+
};
7079
};
7180

7281
rtc_dev: rtc@10003000 {
@@ -348,14 +357,6 @@
348357
status = "disabled";
349358
};
350359

351-
watchdog: watchdog@10002000 {
352-
compatible = "ingenic,jz4780-watchdog";
353-
reg = <0x10002000 0x10>;
354-
355-
clocks = <&cgu JZ4780_CLK_RTCLK>;
356-
clock-names = "rtc";
357-
};
358-
359360
nemc: nemc@13410000 {
360361
compatible = "ingenic,jz4780-nemc";
361362
reg = <0x13410000 0x10000>;

0 commit comments

Comments
 (0)