Skip to content

Commit 990d627

Browse files
zongboxbebarino
zongbox
authored and
bebarino
committed
riscv: dts: Change the macro name of prci in each device node
We currently change the macro name for fu540 and fu740 by adding the prefix respectively, these marcos are referenced by some device nodes, they should be modified as well. Signed-off-by: Zong Li <zong.li@sifive.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> Link: https://lore.kernel.org/r/db92d209fa700f7da8bc8028083476fcc138d80e.1646388139.git.zong.li@sifive.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 0493692 commit 990d627

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎arch/riscv/boot/dts/sifive/fu540-c000.dtsi‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
reg = <0x0 0x10010000 0x0 0x1000>;
165165
interrupt-parent = <&plic0>;
166166
interrupts = <4>;
167-
clocks = <&prci PRCI_CLK_TLCLK>;
167+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
168168
status = "disabled";
169169
};
170170
dma: dma@3000000 {
@@ -180,15 +180,15 @@
180180
reg = <0x0 0x10011000 0x0 0x1000>;
181181
interrupt-parent = <&plic0>;
182182
interrupts = <5>;
183-
clocks = <&prci PRCI_CLK_TLCLK>;
183+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
184184
status = "disabled";
185185
};
186186
i2c0: i2c@10030000 {
187187
compatible = "sifive,fu540-c000-i2c", "sifive,i2c0";
188188
reg = <0x0 0x10030000 0x0 0x1000>;
189189
interrupt-parent = <&plic0>;
190190
interrupts = <50>;
191-
clocks = <&prci PRCI_CLK_TLCLK>;
191+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
192192
reg-shift = <2>;
193193
reg-io-width = <1>;
194194
#address-cells = <1>;
@@ -201,7 +201,7 @@
201201
<0x0 0x20000000 0x0 0x10000000>;
202202
interrupt-parent = <&plic0>;
203203
interrupts = <51>;
204-
clocks = <&prci PRCI_CLK_TLCLK>;
204+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
205205
#address-cells = <1>;
206206
#size-cells = <0>;
207207
status = "disabled";
@@ -212,7 +212,7 @@
212212
<0x0 0x30000000 0x0 0x10000000>;
213213
interrupt-parent = <&plic0>;
214214
interrupts = <52>;
215-
clocks = <&prci PRCI_CLK_TLCLK>;
215+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
216216
#address-cells = <1>;
217217
#size-cells = <0>;
218218
status = "disabled";
@@ -222,7 +222,7 @@
222222
reg = <0x0 0x10050000 0x0 0x1000>;
223223
interrupt-parent = <&plic0>;
224224
interrupts = <6>;
225-
clocks = <&prci PRCI_CLK_TLCLK>;
225+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
226226
#address-cells = <1>;
227227
#size-cells = <0>;
228228
status = "disabled";
@@ -235,8 +235,8 @@
235235
<0x0 0x100a0000 0x0 0x1000>;
236236
local-mac-address = [00 00 00 00 00 00];
237237
clock-names = "pclk", "hclk";
238-
clocks = <&prci PRCI_CLK_GEMGXLPLL>,
239-
<&prci PRCI_CLK_GEMGXLPLL>;
238+
clocks = <&prci FU540_PRCI_CLK_GEMGXLPLL>,
239+
<&prci FU540_PRCI_CLK_GEMGXLPLL>;
240240
#address-cells = <1>;
241241
#size-cells = <0>;
242242
status = "disabled";
@@ -246,7 +246,7 @@
246246
reg = <0x0 0x10020000 0x0 0x1000>;
247247
interrupt-parent = <&plic0>;
248248
interrupts = <42>, <43>, <44>, <45>;
249-
clocks = <&prci PRCI_CLK_TLCLK>;
249+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
250250
#pwm-cells = <3>;
251251
status = "disabled";
252252
};
@@ -255,7 +255,7 @@
255255
reg = <0x0 0x10021000 0x0 0x1000>;
256256
interrupt-parent = <&plic0>;
257257
interrupts = <46>, <47>, <48>, <49>;
258-
clocks = <&prci PRCI_CLK_TLCLK>;
258+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
259259
#pwm-cells = <3>;
260260
status = "disabled";
261261
};
@@ -281,7 +281,7 @@
281281
#gpio-cells = <2>;
282282
interrupt-controller;
283283
#interrupt-cells = <2>;
284-
clocks = <&prci PRCI_CLK_TLCLK>;
284+
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
285285
status = "disabled";
286286
};
287287
};

‎arch/riscv/boot/dts/sifive/fu740-c000.dtsi‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -166,23 +166,23 @@
166166
reg = <0x0 0x10010000 0x0 0x1000>;
167167
interrupt-parent = <&plic0>;
168168
interrupts = <39>;
169-
clocks = <&prci PRCI_CLK_PCLK>;
169+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
170170
status = "disabled";
171171
};
172172
uart1: serial@10011000 {
173173
compatible = "sifive,fu740-c000-uart", "sifive,uart0";
174174
reg = <0x0 0x10011000 0x0 0x1000>;
175175
interrupt-parent = <&plic0>;
176176
interrupts = <40>;
177-
clocks = <&prci PRCI_CLK_PCLK>;
177+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
178178
status = "disabled";
179179
};
180180
i2c0: i2c@10030000 {
181181
compatible = "sifive,fu740-c000-i2c", "sifive,i2c0";
182182
reg = <0x0 0x10030000 0x0 0x1000>;
183183
interrupt-parent = <&plic0>;
184184
interrupts = <52>;
185-
clocks = <&prci PRCI_CLK_PCLK>;
185+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
186186
reg-shift = <2>;
187187
reg-io-width = <1>;
188188
#address-cells = <1>;
@@ -194,7 +194,7 @@
194194
reg = <0x0 0x10031000 0x0 0x1000>;
195195
interrupt-parent = <&plic0>;
196196
interrupts = <53>;
197-
clocks = <&prci PRCI_CLK_PCLK>;
197+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
198198
reg-shift = <2>;
199199
reg-io-width = <1>;
200200
#address-cells = <1>;
@@ -207,7 +207,7 @@
207207
<0x0 0x20000000 0x0 0x10000000>;
208208
interrupt-parent = <&plic0>;
209209
interrupts = <41>;
210-
clocks = <&prci PRCI_CLK_PCLK>;
210+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
211211
#address-cells = <1>;
212212
#size-cells = <0>;
213213
status = "disabled";
@@ -218,7 +218,7 @@
218218
<0x0 0x30000000 0x0 0x10000000>;
219219
interrupt-parent = <&plic0>;
220220
interrupts = <42>;
221-
clocks = <&prci PRCI_CLK_PCLK>;
221+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
222222
#address-cells = <1>;
223223
#size-cells = <0>;
224224
status = "disabled";
@@ -228,7 +228,7 @@
228228
reg = <0x0 0x10050000 0x0 0x1000>;
229229
interrupt-parent = <&plic0>;
230230
interrupts = <43>;
231-
clocks = <&prci PRCI_CLK_PCLK>;
231+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
232232
#address-cells = <1>;
233233
#size-cells = <0>;
234234
status = "disabled";
@@ -241,8 +241,8 @@
241241
<0x0 0x100a0000 0x0 0x1000>;
242242
local-mac-address = [00 00 00 00 00 00];
243243
clock-names = "pclk", "hclk";
244-
clocks = <&prci PRCI_CLK_GEMGXLPLL>,
245-
<&prci PRCI_CLK_GEMGXLPLL>;
244+
clocks = <&prci FU740_PRCI_CLK_GEMGXLPLL>,
245+
<&prci FU740_PRCI_CLK_GEMGXLPLL>;
246246
#address-cells = <1>;
247247
#size-cells = <0>;
248248
status = "disabled";
@@ -252,7 +252,7 @@
252252
reg = <0x0 0x10020000 0x0 0x1000>;
253253
interrupt-parent = <&plic0>;
254254
interrupts = <44>, <45>, <46>, <47>;
255-
clocks = <&prci PRCI_CLK_PCLK>;
255+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
256256
#pwm-cells = <3>;
257257
status = "disabled";
258258
};
@@ -261,7 +261,7 @@
261261
reg = <0x0 0x10021000 0x0 0x1000>;
262262
interrupt-parent = <&plic0>;
263263
interrupts = <48>, <49>, <50>, <51>;
264-
clocks = <&prci PRCI_CLK_PCLK>;
264+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
265265
#pwm-cells = <3>;
266266
status = "disabled";
267267
};
@@ -287,7 +287,7 @@
287287
#gpio-cells = <2>;
288288
interrupt-controller;
289289
#interrupt-cells = <2>;
290-
clocks = <&prci PRCI_CLK_PCLK>;
290+
clocks = <&prci FU740_PRCI_CLK_PCLK>;
291291
status = "disabled";
292292
};
293293
pcie@e00000000 {
@@ -316,7 +316,7 @@
316316
<0x0 0x0 0x0 0x3 &plic0 59>,
317317
<0x0 0x0 0x0 0x4 &plic0 60>;
318318
clock-names = "pcie_aux";
319-
clocks = <&prci PRCI_CLK_PCIE_AUX>;
319+
clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>;
320320
pwren-gpios = <&gpio 5 0>;
321321
reset-gpios = <&gpio 8 0>;
322322
resets = <&prci 4>;

0 commit comments

Comments
 (0)