Commit a8914b6c authored by Palmer Dabbelt's avatar Palmer Dabbelt

Merge tag 'dt-for-palmer-v5.20-mw0' of...

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
parents 44c1e84a 88d319c6
...@@ -138,6 +138,30 @@ cpu4_intc: interrupt-controller { ...@@ -138,6 +138,30 @@ cpu4_intc: interrupt-controller {
interrupt-controller; interrupt-controller;
}; };
}; };
cpu-map {
cluster0 {
core0 {
cpu = <&cpu0>;
};
core1 {
cpu = <&cpu1>;
};
core2 {
cpu = <&cpu2>;
};
core3 {
cpu = <&cpu3>;
};
core4 {
cpu = <&cpu4>;
};
};
};
}; };
refclk: mssrefclk { refclk: mssrefclk {
...@@ -278,7 +302,6 @@ spi0: spi@20108000 { ...@@ -278,7 +302,6 @@ spi0: spi@20108000 {
interrupt-parent = <&plic>; interrupt-parent = <&plic>;
interrupts = <54>; interrupts = <54>;
clocks = <&clkcfg CLK_SPI0>; clocks = <&clkcfg CLK_SPI0>;
spi-max-frequency = <25000000>;
status = "disabled"; status = "disabled";
}; };
...@@ -290,7 +313,6 @@ spi1: spi@20109000 { ...@@ -290,7 +313,6 @@ spi1: spi@20109000 {
interrupt-parent = <&plic>; interrupt-parent = <&plic>;
interrupts = <55>; interrupts = <55>;
clocks = <&clkcfg CLK_SPI1>; clocks = <&clkcfg CLK_SPI1>;
spi-max-frequency = <25000000>;
status = "disabled"; status = "disabled";
}; };
...@@ -302,7 +324,6 @@ qspi: spi@21000000 { ...@@ -302,7 +324,6 @@ qspi: spi@21000000 {
interrupt-parent = <&plic>; interrupt-parent = <&plic>;
interrupts = <85>; interrupts = <85>;
clocks = <&clkcfg CLK_QSPI>; clocks = <&clkcfg CLK_QSPI>;
spi-max-frequency = <25000000>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment