Skip to content

Commit 232085d

Browse files
parakatsbogend
authored andcommitted
mips: dts: ralink: mt7628a: update system controller node and its consumers
Current MT7628A device tree file system controller node is wrong since it is not matching bindings. Hence, update it to match current bindings updating it also to use new introduced clock constants. Signed-off-by: Sergio Paracuellos <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent e64d19e commit 232085d

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/dts-v1/;
77

8-
/include/ "mt7628a.dtsi"
8+
#include "mt7628a.dtsi"
99

1010
#include <dt-bindings/gpio/gpio.h>
1111
#include <dt-bindings/input/input.h>

arch/mips/boot/dts/ralink/mt7628a.dtsi

Lines changed: 25 additions & 15 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/mediatek,mtmips-sysc.h>
23

34
/ {
45
#address-cells = <1>;
@@ -16,11 +17,6 @@
1617
};
1718
};
1819

19-
resetc: reset-controller {
20-
compatible = "ralink,rt2880-reset";
21-
#reset-cells = <1>;
22-
};
23-
2420
cpuintc: interrupt-controller {
2521
#address-cells = <0>;
2622
#interrupt-cells = <1>;
@@ -36,9 +32,11 @@
3632
#address-cells = <1>;
3733
#size-cells = <1>;
3834

39-
sysc: system-controller@0 {
40-
compatible = "ralink,mt7620a-sysc", "syscon";
35+
sysc: syscon@0 {
36+
compatible = "ralink,mt7628-sysc", "syscon";
4137
reg = <0x0 0x60>;
38+
#clock-cells = <1>;
39+
#reset-cells = <1>;
4240
};
4341

4442
pinmux: pinmux@60 {
@@ -138,7 +136,7 @@
138136
compatible = "mediatek,mt7621-wdt";
139137
reg = <0x100 0x30>;
140138

141-
resets = <&resetc 8>;
139+
resets = <&sysc 8>;
142140
reset-names = "wdt";
143141

144142
interrupt-parent = <&intc>;
@@ -154,7 +152,7 @@
154152
interrupt-controller;
155153
#interrupt-cells = <1>;
156154

157-
resets = <&resetc 9>;
155+
resets = <&sysc 9>;
158156
reset-names = "intc";
159157

160158
interrupt-parent = <&cpuintc>;
@@ -190,7 +188,9 @@
190188
pinctrl-names = "default";
191189
pinctrl-0 = <&pinmux_spi_spi>;
192190

193-
resets = <&resetc 18>;
191+
clocks = <&sysc MT76X8_CLK_SPI1>;
192+
193+
resets = <&sysc 18>;
194194
reset-names = "spi";
195195

196196
#address-cells = <1>;
@@ -206,7 +206,9 @@
206206
pinctrl-names = "default";
207207
pinctrl-0 = <&pinmux_i2c_i2c>;
208208

209-
resets = <&resetc 16>;
209+
clocks = <&sysc MT76X8_CLK_I2C>;
210+
211+
resets = <&sysc 16>;
210212
reset-names = "i2c";
211213

212214
#address-cells = <1>;
@@ -222,7 +224,9 @@
222224
pinctrl-names = "default";
223225
pinctrl-0 = <&pinmux_uart0_uart>;
224226

225-
resets = <&resetc 12>;
227+
clocks = <&sysc MT76X8_CLK_UART0>;
228+
229+
resets = <&sysc 12>;
226230
reset-names = "uart0";
227231

228232
interrupt-parent = <&intc>;
@@ -238,7 +242,9 @@
238242
pinctrl-names = "default";
239243
pinctrl-0 = <&pinmux_uart1_uart>;
240244

241-
resets = <&resetc 19>;
245+
clocks = <&sysc MT76X8_CLK_UART1>;
246+
247+
resets = <&sysc 19>;
242248
reset-names = "uart1";
243249

244250
interrupt-parent = <&intc>;
@@ -254,7 +260,9 @@
254260
pinctrl-names = "default";
255261
pinctrl-0 = <&pinmux_uart2_uart>;
256262

257-
resets = <&resetc 20>;
263+
clocks = <&sysc MT76X8_CLK_UART2>;
264+
265+
resets = <&sysc 20>;
258266
reset-names = "uart2";
259267

260268
interrupt-parent = <&intc>;
@@ -271,7 +279,7 @@
271279
#phy-cells = <0>;
272280

273281
ralink,sysctl = <&sysc>;
274-
resets = <&resetc 22 &resetc 25>;
282+
resets = <&sysc 22 &sysc 25>;
275283
reset-names = "host", "device";
276284
};
277285

@@ -290,6 +298,8 @@
290298
compatible = "mediatek,mt7628-wmac";
291299
reg = <0x10300000 0x100000>;
292300

301+
clocks = <&sysc MT76X8_CLK_WMAC>;
302+
293303
interrupt-parent = <&cpuintc>;
294304
interrupts = <6>;
295305

arch/mips/boot/dts/ralink/omega2p.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/dts-v1/;
22

3-
/include/ "mt7628a.dtsi"
3+
#include "mt7628a.dtsi"
44

55
/ {
66
compatible = "onion,omega2+", "ralink,mt7688a-soc", "ralink,mt7628a-soc";

0 commit comments

Comments
 (0)