arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file

[ Upstream commit 3a52a48973b355b3aac5add92ef50650ae37c2bd ]

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 <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index 861469a439a5a3b2570cc4f173ab24cf7d07dbb2..874bc3954c8e65729e8e8ca3215c746e3cd76ba5 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -108,10 +108,8 @@
        };
 
        firmware {
-               turris-mox-rwtm {
-                       compatible = "cznic,turris-mox-rwtm";
-                       mboxes = <&rwtm 0>;
-                       status = "okay";
+               armada-3700-rwtm {
+                       compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm";
                };
        };
 };

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 6cb1278613c5e62c4cc9ae4bcacb99a6f2a22500..52767037e04940f6f4c72ae5680b5d110d5788f0 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -500,4 +500,12 @@
                        };
                };
        };
+
+       firmware {
+               armada-3700-rwtm {
+                       compatible = "marvell,armada-3700-rwtm-firmware";
+                       mboxes = <&rwtm 0>;
+                       status = "okay";
+               };
+       };
 };