lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 082/125] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file
    Date
    From: Pali Rohár <pali@kernel.org>

    [ 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>
    ---
    arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 6 ++----
    arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 ++++++++
    2 files changed, 10 insertions(+), 4 deletions(-)

    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 cca143e4b6bf..389aebdb35f1 100644
    --- 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 879115dfdf82..83d2d83f7692 100644
    --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    @@ -502,4 +502,12 @@
    };
    };
    };
    +
    + firmware {
    + armada-3700-rwtm {
    + compatible = "marvell,armada-3700-rwtm-firmware";
    + mboxes = <&rwtm 0>;
    + status = "okay";
    + };
    + };
    };
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:34    [W:4.065 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site