From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53869C433ED for ; Thu, 6 May 2021 09:09:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17DD5611EE for ; Thu, 6 May 2021 09:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234090AbhEFJKD (ORCPT ); Thu, 6 May 2021 05:10:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:47122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234014AbhEFJKC (ORCPT ); Thu, 6 May 2021 05:10:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B7A360FEE; Thu, 6 May 2021 09:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620292144; bh=HaAfWtOAafkNSsvz88e84TAEk52kR7zNGm+Hs1lufVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kbz3ZT3czmDTPiEHofA2omrUzRRbVbZvQ9cVWU+5hyYE80BUTfKlHHMNOvyP3clN5 wD4qvnDOoWcmLh0KNq4IwcLF+u0Z7KOeE24Ah09aOzzOrv6SIx9q4/VzcVZZSLdEtL ve60187F0+KLqVy5q61j4peVs0JD4Jz/+GSF+gGLs6ajNcSMxmTE5a6EooyLpaZv9p BKoCjDR4KA4dNuCt3YfB15hcTeXTTbVUPf5v4XzylVVDCrAXt7iFQTt0zckNSnaooI pG6ov8gbmdsEdt7T06f+Amae9J+ZJRJI+OGJQv2bN9KqDI3PDijh+G1C/1scduatgB uPKU8ld7JmWOQ== Received: by pali.im (Postfix) id 5F565732; Thu, 6 May 2021 11:09:02 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory CLEMENT , Andrew Lunn Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 mvebu + mvebu/dt64 6/6] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file Date: Thu, 6 May 2021 11:08:02 +0200 Message-Id: <20210506090802.14268-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506090802.14268-1-pali@kernel.org> References: <20210308153703.23097-1-kabel@kernel.org> <20210506090802.14268-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Marek Behún Cc: # 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64F50C433ED for ; Thu, 6 May 2021 09:12:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6C35610C8 for ; Thu, 6 May 2021 09:12:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6C35610C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ErTYoBYR5Fn/49pxg9kMJhlr/gvqpXlms9EwffxkBEY=; b=dwWj9VnhVWf2lKwu2BkLAJcg8 Ppkk4A26Wu1uAcmHwhIdgFRNDjKjtheCu2+QUT7kAsZ+AUcnRGA17Id7TU5VFh/M0ec+1Dtk7mdNV ZvLfhCJV31eeC88haYzielytibDCjF9G3JjC5bRkS+4u61bVbvVR0PFVlnpq0eq5z+/m1dXkh88Lq 7y6tRLEMbSDxDv8Lgll3Qkry9/g4mmdXZqbfd1DxiDsGzBnBok3vK/LJzxamuoaxa/vr48VrF2zwx Qe+h3lcam7k9Orc+NYkgXqHODc+RUoByf2wken6G21Ay80sNjqLtHmdyGjfvpflgLQ5yen1h3SzcV fTdju0a0g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lea0x-003l1Q-KF; Thu, 06 May 2021 09:09:47 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lea0J-003kt2-72 for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 09:09:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=QAs0VKDf2DS+kHVA7k/n+0JwJhlXpIcQsC7I+/kBXa0=; b=43W8E9SU/bW69oB1LubV+0TA2k iOyvAmBK0Sg69Y19jgtX/BaqCEZ4Cjgp0SueeW+J3i2udW5WbQHvIKEHM3Dwu2lUG67B5F+1nraCM i/aPoRBha9izDEhDaHSTH2gwjCdaozCyNv67VWCDxveJnlqXVnVBHAc4KENwv+OmUoyuO8qYNzM4q Ti7d5K078n9oXA0BwAc7tajLIdXQng34llaGAiLvoPXUZm64ta86C3vYjoo3WQUfidJTAkuHJ9lVL e9bSBJG34XsQyAEyZFL6ZKnI3hIIO0tt06ZlFRdIgQJcds50iGQ/Xl9VIePQP3XnF2x9E3izdMBAI 4tidqe3Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lea0G-005tTr-Nl for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 09:09:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B7A360FEE; Thu, 6 May 2021 09:09:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620292144; bh=HaAfWtOAafkNSsvz88e84TAEk52kR7zNGm+Hs1lufVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kbz3ZT3czmDTPiEHofA2omrUzRRbVbZvQ9cVWU+5hyYE80BUTfKlHHMNOvyP3clN5 wD4qvnDOoWcmLh0KNq4IwcLF+u0Z7KOeE24Ah09aOzzOrv6SIx9q4/VzcVZZSLdEtL ve60187F0+KLqVy5q61j4peVs0JD4Jz/+GSF+gGLs6ajNcSMxmTE5a6EooyLpaZv9p BKoCjDR4KA4dNuCt3YfB15hcTeXTTbVUPf5v4XzylVVDCrAXt7iFQTt0zckNSnaooI pG6ov8gbmdsEdt7T06f+Amae9J+ZJRJI+OGJQv2bN9KqDI3PDijh+G1C/1scduatgB uPKU8ld7JmWOQ== Received: by pali.im (Postfix) id 5F565732; Thu, 6 May 2021 11:09:02 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory CLEMENT , Andrew Lunn Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 mvebu + mvebu/dt64 6/6] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file Date: Thu, 6 May 2021 11:08:02 +0200 Message-Id: <20210506090802.14268-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506090802.14268-1-pali@kernel.org> References: <20210308153703.23097-1-kabel@kernel.org> <20210506090802.14268-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210506_020904_822987_A49A2FF4 X-CRM114-Status: GOOD ( 14.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org TW92ZSB0aGUgdHVycmlzLW1veC1yd3RtIGZpcm13YXJlIG5vZGUgZnJvbSBUdXJyaXMgTU9YJyBk ZXZpY2UgdHJlZSBpbnRvCnRoZSBnZW5lcmljIGFybWFkYS0zN3h4LmR0c2kgZmlsZSBhbmQgdXNl IHRoZSBnZW5lcmljIGNvbXBhdGlibGUgc3RyaW5nCidtYXJ2ZWxsLGFybWFkYS0zNzAwLXJ3dG0t ZmlybXdhcmUnIGluc3RlYWQgb2YgdGhlIGN1cnJlbnQgb25lLgoKVGhlIFR1cnJpcyBNT1ggcldU TSBmaXJtd2FyZSBjYW4gYmUgdXNlZCBvbiBhbnkgQXJtYWRhIDM3eHggZGV2aWNlLApnaXZpbmcg dGhlbSBhY2Nlc3MgdG8gdGhlIHJXVE0gaGFyZHdhcmUgcmFuZG9tIG51bWJlciBnZW5lcmF0b3Is IHdoaWNoCmlzIG90aGVyd2lzZSB1bmF2YWlsYWJsZS4KClRoaXMgY2hhbmdlIGFsbG93cyBMaW51 eCB0byBsb2FkIHRoZSB0dXJyaXMtbW94LXJ3dG0ua28gbW9kdWxlIG9uIHRoZXNlCmJvYXJkcy4K ClRlc3RlZCBvbiBFU1BSRVNTT2JpbiB2NSB3aXRoIGJvdGggZGVmYXVsdCBNYXJ2ZWxsIFdUTUkg ZmlybXdhcmUgYW5kCkNaLk5JQydzIGZpcm13YXJlLiBXaXRoIGRlZmF1bHQgV1RNSSBmaXJtd2Fy ZSB0aGUgdHVycmlzLW1veC1yd3RtIGZhaWxzCnRvIHByb2JlLCB3aGlsZSB3aXRoIENaLk5JQydz IGZpcm13YXJlIGl0IHJlZ2lzdGVycyB0aGUgSFcgcmFuZG9tIG51bWJlcgpnZW5lcmF0b3IuCgpT aWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8cGFsaUBrZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5 OiBNYXJlayBCZWjDum4gPGthYmVsQGtlcm5lbC5vcmc+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVs Lm9yZz4gIyA1LjQrOiA0NmQyZjZkMGM5OWYgKCJhcm02NDogZHRzOiBhcm1hZGEtMzcyMC10dXJy aXMtbW94OiBhZGQgZmlybXdhcmUgbm9kZSIpCi0tLQogYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2 ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzIHwgOCAtLS0tLS0tLQogYXJjaC9hcm02NC9i b290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zN3h4LmR0c2kgICAgICAgICAgIHwgOCArKysrKysrKwog MiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3gu ZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3gu ZHRzCmluZGV4IDA3NTNjYzQ4OTYzOC4uZWJiMGRkZjhkMzA2IDEwMDY0NAotLS0gYS9hcmNoL2Fy bTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtdHVycmlzLW1veC5kdHMKKysrIGIvYXJj aC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzCkBAIC0x MDcsMTQgKzEwNyw2IEBACiAJCS8qIGVuYWJsZWQgYnkgVS1Cb290IGlmIFNGUCBtb2R1bGUgaXMg cHJlc2VudCAqLwogCQlzdGF0dXMgPSAiZGlzYWJsZWQiOwogCX07Ci0KLQlmaXJtd2FyZSB7Ci0J CXR1cnJpcy1tb3gtcnd0bSB7Ci0JCQljb21wYXRpYmxlID0gImN6bmljLHR1cnJpcy1tb3gtcnd0 bSI7Ci0JCQltYm94ZXMgPSA8JnJ3dG0gMD47Ci0JCQlzdGF0dXMgPSAib2theSI7Ci0JCX07Ci0J fTsKIH07CiAKICZpMmMwIHsKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVs bC9hcm1hZGEtMzd4eC5kdHNpIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0z N3h4LmR0c2kKaW5kZXggMWI3ZjQzZTI3NTg5Li44NDdhMmQxMmE0YmUgMTAwNjQ0Ci0tLSBhL2Fy Y2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzd4eC5kdHNpCisrKyBiL2FyY2gvYXJt NjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzd4eC5kdHNpCkBAIC01MDUsNCArNTA1LDEyIEBA CiAJCQl9OwogCQl9OwogCX07CisKKwlmaXJtd2FyZSB7CisJCWFybWFkYS0zNzAwLXJ3dG0gewor CQkJY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLGFybWFkYS0zNzAwLXJ3dG0tZmlybXdhcmUiOworCQkJ bWJveGVzID0gPCZyd3RtIDA+OworCQkJc3RhdHVzID0gIm9rYXkiOworCQl9OworCX07CiB9Owot LSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo=