Skip to content

Commit ffeb2b9

Browse files
paliksacilotto
authored andcommitted
arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file
BugLink: https://bugs.launchpad.net/bugs/1939442 [ Upstream commit 3a52a48 ] Move the turris-mox-rwtm firmware node from Turris MOX' device tree into the generic armada-37xx.dtsi file and use the generic compatible string 'marvell,armada-3700-rwtm-firmware' instead of the current one. Turris MOX DTS file contains also old compatible string for backward compatibility. The Turris MOX rWTM firmware can be used on any Armada 37xx device, giving them access to the rWTM hardware random number generator, which is otherwise unavailable. This change allows Linux to load the turris-mox-rwtm.ko module on these boards. Tested on ESPRESSObin v5 with both default Marvell WTMI firmware and CZ.NIC's firmware. With default WTMI firmware the turris-mox-rwtm fails to probe, while with CZ.NIC's firmware it registers the HW random number generator. Signed-off-by: Pali Rohár <[email protected]> Signed-off-by: Marek Behún <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>
1 parent 8aa9cf1 commit ffeb2b9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,8 @@
108108
};
109109

110110
firmware {
111-
turris-mox-rwtm {
112-
compatible = "cznic,turris-mox-rwtm";
113-
mboxes = <&rwtm 0>;
114-
status = "okay";
111+
armada-3700-rwtm {
112+
compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm";
115113
};
116114
};
117115
};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,4 +500,12 @@
500500
};
501501
};
502502
};
503+
504+
firmware {
505+
armada-3700-rwtm {
506+
compatible = "marvell,armada-3700-rwtm-firmware";
507+
mboxes = <&rwtm 0>;
508+
status = "okay";
509+
};
510+
};
503511
};

0 commit comments

Comments
 (0)