Skip to content

Commit a8914b6

Browse files
Merge tag 'dt-for-palmer-v5.20-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git into for-next
Microchip RISC-V devicetrees for 5.20 A pair of changes for mpfs.dtsi: - A pair of patches from Suresh & I, removing the bogus max frequency properties from the controller nodes for {q,}spi. This is a device only property with no meaning for a controller and should never have been there. - RISC-V has no sensible defaults for cpu topology, so I added a this information to the dt for MPFS as a cpu-map. This is an optional property and therefore is not a fix. * tag 'dt-for-palmer-v5.20-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git: riscv: dts: microchip: Add mpfs' topology information riscv: dts: microchip: remove spi-max-frequency property riscv: dts: microchip: remove spi-max-frequency property
2 parents 44c1e84 + 88d319c commit a8914b6

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,30 @@
138138
interrupt-controller;
139139
};
140140
};
141+
142+
cpu-map {
143+
cluster0 {
144+
core0 {
145+
cpu = <&cpu0>;
146+
};
147+
148+
core1 {
149+
cpu = <&cpu1>;
150+
};
151+
152+
core2 {
153+
cpu = <&cpu2>;
154+
};
155+
156+
core3 {
157+
cpu = <&cpu3>;
158+
};
159+
160+
core4 {
161+
cpu = <&cpu4>;
162+
};
163+
};
164+
};
141165
};
142166

143167
refclk: mssrefclk {
@@ -278,7 +302,6 @@
278302
interrupt-parent = <&plic>;
279303
interrupts = <54>;
280304
clocks = <&clkcfg CLK_SPI0>;
281-
spi-max-frequency = <25000000>;
282305
status = "disabled";
283306
};
284307

@@ -290,7 +313,6 @@
290313
interrupt-parent = <&plic>;
291314
interrupts = <55>;
292315
clocks = <&clkcfg CLK_SPI1>;
293-
spi-max-frequency = <25000000>;
294316
status = "disabled";
295317
};
296318

@@ -302,7 +324,6 @@
302324
interrupt-parent = <&plic>;
303325
interrupts = <85>;
304326
clocks = <&clkcfg CLK_QSPI>;
305-
spi-max-frequency = <25000000>;
306327
status = "disabled";
307328
};
308329

0 commit comments

Comments
 (0)