Skip to content

Commit 6f86a41

Browse files
committed
riscv: dts: microchip: fix mailbox description
When the binding for the mailbox on PolarFire SoC was originally written, and later modified, mistakes were made - and the precise nature of the later modification should have been a giveaway, but alas I was naive at the time. A more correct modelling of the hardware is to use two syscons and have a single reg entry for the mailbox, containing the mailbox region. The two syscons contain the general control/status registers for the mailbox and the interrupt related registers respectively. The reason for two syscons is that the same mailbox is present on the non-SoC version of the FPGA, which has no interrupt controller, and the shared part of the rtl was unchanged between devices. Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent 8f0b4cc commit 6f86a41

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@
259259
#reset-cells = <1>;
260260
};
261261

262+
sysreg_scb: syscon@20003000 {
263+
compatible = "microchip,mpfs-sysreg-scb", "syscon";
264+
reg = <0x0 0x20003000 0x0 0x1000>;
265+
};
266+
262267
ccc_se: clock-controller@38010000 {
263268
compatible = "microchip,mpfs-ccc";
264269
reg = <0x0 0x38010000 0x0 0x1000>, <0x0 0x38020000 0x0 0x1000>,
@@ -521,10 +526,14 @@
521526
status = "disabled";
522527
};
523528

524-
mbox: mailbox@37020000 {
529+
control_scb: syscon@37020000 {
530+
compatible = "microchip,mpfs-control-scb", "syscon";
531+
reg = <0x0 0x37020000 0x0 0x100>;
532+
};
533+
534+
mbox: mailbox@37020800 {
525535
compatible = "microchip,mpfs-mailbox";
526-
reg = <0x0 0x37020000 0x0 0x58>, <0x0 0x2000318C 0x0 0x40>,
527-
<0x0 0x37020800 0x0 0x100>;
536+
reg = <0x0 0x37020800 0x0 0x1000>;
528537
interrupt-parent = <&plic>;
529538
interrupts = <96>;
530539
#mbox-cells = <1>;

0 commit comments

Comments
 (0)