提交 dea926f2 编写于 作者: P Pali Rohár 提交者: Zheng Zengkai

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

stable inclusion
from stable-5.10.53
commit d92aa22f24199e55a3d5a1854498a756c6f60449
bugzilla: 175574 https://gitee.com/openeuler/kernel/issues/I4DTUX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d92aa22f24199e55a3d5a1854498a756c6f60449

--------------------------------

[ Upstream commit 3a52a489 ]

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: NPali Rohár <pali@kernel.org>
Signed-off-by: NMarek Behún <kabel@kernel.org>
Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
Signed-off-by: NGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 17921548
...@@ -108,10 +108,8 @@ ...@@ -108,10 +108,8 @@
}; };
firmware { firmware {
turris-mox-rwtm { armada-3700-rwtm {
compatible = "cznic,turris-mox-rwtm"; compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm";
mboxes = <&rwtm 0>;
status = "okay";
}; };
}; };
}; };
......
...@@ -502,4 +502,12 @@ ...@@ -502,4 +502,12 @@
}; };
}; };
}; };
firmware {
armada-3700-rwtm {
compatible = "marvell,armada-3700-rwtm-firmware";
mboxes = <&rwtm 0>;
status = "okay";
};
};
}; };
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册