Skip to content

Commit eb41113

Browse files
XBurstpaulburton
authored andcommitted
MIPS: X1000: Fix clock of watchdog node.
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 clock of watchdog node from "&cgu X1000_CLK_RTCLK" to "&tcu TCU_CLK_WDT" to comply with the new ABI. Fixes: 7a16ccd ("[v8,1/4] MIPS: Ingenic: Add Ingenic X1000 support."). Signed-off-by: 周琰杰 (Zhou Yanjie) <[email protected]> Signed-off-by: Paul Burton <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
1 parent 72cf3b3 commit eb41113

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <dt-bindings/clock/ingenic,tcu.h>
23
#include <dt-bindings/clock/x1000-cgu.h>
34
#include <dt-bindings/dma/x1000-dma.h>
45

@@ -72,7 +73,7 @@
7273
compatible = "ingenic,x1000-watchdog", "ingenic,jz4780-watchdog";
7374
reg = <0x0 0x10>;
7475

75-
clocks = <&cgu X1000_CLK_RTCLK>;
76+
clocks = <&tcu TCU_CLK_WDT>;
7677
clock-names = "wdt";
7778
};
7879
};
@@ -158,7 +159,6 @@
158159
i2c0: i2c-controller@10050000 {
159160
compatible = "ingenic,x1000-i2c";
160161
reg = <0x10050000 0x1000>;
161-
162162
#address-cells = <1>;
163163
#size-cells = <0>;
164164

@@ -173,7 +173,6 @@
173173
i2c1: i2c-controller@10051000 {
174174
compatible = "ingenic,x1000-i2c";
175175
reg = <0x10051000 0x1000>;
176-
177176
#address-cells = <1>;
178177
#size-cells = <0>;
179178

@@ -188,7 +187,6 @@
188187
i2c2: i2c-controller@10052000 {
189188
compatible = "ingenic,x1000-i2c";
190189
reg = <0x10052000 0x1000>;
191-
192190
#address-cells = <1>;
193191
#size-cells = <0>;
194192

0 commit comments

Comments
 (0)