Skip to content

Commit 53101cf

Browse files
committed
riscv: dts: microchip: use clk defines for icicle kit
Update the Microchip Icicle kit device tree by replacing clock related magic numbers with their defined counterparts. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 91a5334 commit 53101cf

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
memory@80000000 {
3434
device_type = "memory";
3535
reg = <0x0 0x80000000 0x0 0x40000000>;
36-
clocks = <&clkcfg 26>;
36+
clocks = <&clkcfg CLK_DDRC>;
3737
};
3838

3939
soc {

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Copyright (c) 2020 Microchip Technology Inc */
33

44
/dts-v1/;
5+
#include "dt-bindings/clock/microchip,mpfs-clock.h"
56

67
/ {
78
#address-cells = <2>;
@@ -14,14 +15,14 @@
1415
#size-cells = <0>;
1516

1617
cpu@0 {
17-
clock-frequency = <0>;
1818
compatible = "sifive,e51", "sifive,rocket0", "riscv";
1919
device_type = "cpu";
2020
i-cache-block-size = <64>;
2121
i-cache-sets = <128>;
2222
i-cache-size = <16384>;
2323
reg = <0>;
2424
riscv,isa = "rv64imac";
25+
clocks = <&clkcfg CLK_CPU>;
2526
status = "disabled";
2627

2728
cpu0_intc: interrupt-controller {
@@ -32,7 +33,6 @@
3233
};
3334

3435
cpu@1 {
35-
clock-frequency = <0>;
3636
compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
3737
d-cache-block-size = <64>;
3838
d-cache-sets = <64>;
@@ -48,6 +48,7 @@
4848
mmu-type = "riscv,sv39";
4949
reg = <1>;
5050
riscv,isa = "rv64imafdc";
51+
clocks = <&clkcfg CLK_CPU>;
5152
tlb-split;
5253
status = "okay";
5354

@@ -59,7 +60,6 @@
5960
};
6061

6162
cpu@2 {
62-
clock-frequency = <0>;
6363
compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
6464
d-cache-block-size = <64>;
6565
d-cache-sets = <64>;
@@ -75,6 +75,7 @@
7575
mmu-type = "riscv,sv39";
7676
reg = <2>;
7777
riscv,isa = "rv64imafdc";
78+
clocks = <&clkcfg CLK_CPU>;
7879
tlb-split;
7980
status = "okay";
8081

@@ -86,7 +87,6 @@
8687
};
8788

8889
cpu@3 {
89-
clock-frequency = <0>;
9090
compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
9191
d-cache-block-size = <64>;
9292
d-cache-sets = <64>;
@@ -102,6 +102,7 @@
102102
mmu-type = "riscv,sv39";
103103
reg = <3>;
104104
riscv,isa = "rv64imafdc";
105+
clocks = <&clkcfg CLK_CPU>;
105106
tlb-split;
106107
status = "okay";
107108

@@ -113,7 +114,6 @@
113114
};
114115

115116
cpu@4 {
116-
clock-frequency = <0>;
117117
compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
118118
d-cache-block-size = <64>;
119119
d-cache-sets = <64>;
@@ -129,6 +129,7 @@
129129
mmu-type = "riscv,sv39";
130130
reg = <4>;
131131
riscv,isa = "rv64imafdc";
132+
clocks = <&clkcfg CLK_CPU>;
132133
tlb-split;
133134
status = "okay";
134135
cpu4_intc: interrupt-controller {
@@ -209,7 +210,7 @@
209210
interrupt-parent = <&plic>;
210211
interrupts = <90>;
211212
current-speed = <115200>;
212-
clocks = <&clkcfg 8>;
213+
clocks = <&clkcfg CLK_MMUART0>;
213214
status = "disabled";
214215
};
215216

@@ -221,7 +222,7 @@
221222
interrupt-parent = <&plic>;
222223
interrupts = <91>;
223224
current-speed = <115200>;
224-
clocks = <&clkcfg 9>;
225+
clocks = <&clkcfg CLK_MMUART1>;
225226
status = "disabled";
226227
};
227228

@@ -233,7 +234,7 @@
233234
interrupt-parent = <&plic>;
234235
interrupts = <92>;
235236
current-speed = <115200>;
236-
clocks = <&clkcfg 10>;
237+
clocks = <&clkcfg CLK_MMUART2>;
237238
status = "disabled";
238239
};
239240

@@ -245,7 +246,7 @@
245246
interrupt-parent = <&plic>;
246247
interrupts = <93>;
247248
current-speed = <115200>;
248-
clocks = <&clkcfg 11>;
249+
clocks = <&clkcfg CLK_MMUART3>;
249250
status = "disabled";
250251
};
251252

@@ -255,7 +256,7 @@
255256
reg = <0x0 0x20008000 0x0 0x1000>;
256257
interrupt-parent = <&plic>;
257258
interrupts = <88>, <89>;
258-
clocks = <&clkcfg 6>;
259+
clocks = <&clkcfg CLK_MMC>;
259260
max-frequency = <200000000>;
260261
status = "disabled";
261262
};
@@ -266,7 +267,7 @@
266267
interrupt-parent = <&plic>;
267268
interrupts = <64>, <65>, <66>, <67>;
268269
local-mac-address = [00 00 00 00 00 00];
269-
clocks = <&clkcfg 4>, <&clkcfg 2>;
270+
clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>;
270271
clock-names = "pclk", "hclk";
271272
status = "disabled";
272273
#address-cells = <1>;
@@ -279,7 +280,7 @@
279280
interrupt-parent = <&plic>;
280281
interrupts = <70>, <71>, <72>, <73>;
281282
local-mac-address = [00 00 00 00 00 00];
282-
clocks = <&clkcfg 5>, <&clkcfg 2>;
283+
clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
283284
status = "disabled";
284285
clock-names = "pclk", "hclk";
285286
#address-cells = <1>;

0 commit comments

Comments
 (0)