lkml.org 
[lkml]   [2021]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 mvebu + mvebu/dt64 6/6] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file
    Date
    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.

    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>
    Cc: <stable@vger.kernel.org> # 5.4+: 46d2f6d0c99f ("arm64: dts: armada-3720-turris-mox: add firmware node")
    ---
    arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 8 --------
    arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 ++++++++
    2 files changed, 8 insertions(+), 8 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 0753cc489638..ebb0ddf8d306 100644
    --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
    +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
    @@ -107,14 +107,6 @@
    /* enabled by U-Boot if SFP module is present */
    status = "disabled";
    };
    -
    - firmware {
    - turris-mox-rwtm {
    - compatible = "cznic,turris-mox-rwtm";
    - mboxes = <&rwtm 0>;
    - status = "okay";
    - };
    - };
    };

    &i2c0 {
    diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    index 1b7f43e27589..847a2d12a4be 100644
    --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
    @@ -505,4 +505,12 @@
    };
    };
    };
    +
    + firmware {
    + armada-3700-rwtm {
    + compatible = "marvell,armada-3700-rwtm-firmware";
    + mboxes = <&rwtm 0>;
    + status = "okay";
    + };
    + };
    };
    --
    2.20.1
    \
     
     \ /
      Last update: 2021-05-06 11:09    [W:2.772 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site