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.4 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,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 7D934C433ED for ; Thu, 20 May 2021 11:43:33 +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 F169260FEE for ; Thu, 20 May 2021 11:43:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F169260FEE 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=u0fxlSodYAwhwqL7JuLGeVAyxLldPdF3RfFMwxvXkt4=; b=rXI+L3t6mXDyo50yfFMx8R7eGe DWOwwF0Q8oUInhaO9IkiIamGBxu1cem5TAZ8zLASgHPa/J0rwpX1i/ef3Xhzilc7F7svoq/JJ+qwJ GeIR8m4GH7NVLyC+vtEOcFqfx+oM8reQGzHsIk4jz+Q5KxC9nWyUXHkb9JBm21Gue7VjkT1LeUlCA U8qj6bAYa5SgAsZHLmjm9u3ZUSQG3o71GDz8yt6CO6N3+sQBkUOX+slzUS1MAe5U01q61jC5DNqTj X3x3gI0e/ZuOikK3nh08McvYS7FPnxLSLyssXkAto6/+7VtaqtRiDzkEf6LOfOVOtJ5EFqv7y+rLb udtT5nNw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljh3n-000Ydo-EJ; Thu, 20 May 2021 11:41:51 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljh0y-000X8u-1u for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 11:38:56 +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=4rgIc++4TJTuM9wtVdQOpz0Upm10Q0DiwP+oe4vcLns=; b=rOt0Fvbl4eNFo+IdsZEZj4nJM9 VtMKCtRS61rFPoMq7c3YKqh/H1x8GMCWo3XUfrgVcU8C1lDy4j9ubzPoTK06yGrN908Fj6UQG5+UR +9WCc52glX4li2XQPnP+GRLEOJGoESTc8Ffb3tfP2a12ZNRJGvVO9sWc0ii/RcfCDEzXs+CH/Yfps afLdJ1F0cSpsIT3divm+RQ9apnkRAilGvCXOG45O4CyTZR87gMDmka3DKb9vTlispx2JEOz83KVvF PSH1VNOsnfvCY9tjarNJwAsKVwcRtK9K91WKa2a0sUhJiI2DRDE5p/c6ogmp93PNQl9nOTSWfCUZQ JCMbVFfw==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljh0v-00GG67-93 for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 11:38:54 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D73DF61057; Thu, 20 May 2021 11:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621510733; bh=vlHTNsPasjda2fZpQUYmE5kVMjIxEDkJ+IuDW3NomvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXSunl/kzCfQEcgu366I8FZ9Hf6mzr94R6r1XFejwIi0A6XRKBxqdDQyLJJ03Zgrf iVSG6By3JNbrGnxZaXQbayHXUOGtmL1iiqVkIAgQuJjYh+7PPOte1VXwCRGEzSEZJi s4EC9ABNINMLRsNOZsx3aK1JwWMcncCMO3x8+l3gbhYFufwcITYC+fiEGKskSsOpH2 yZeX4a43dbqZLc0q7uHwtee+phzxCIbpPiqBdLZahC3KHDRSp5TCVLTGem/Jbpe2ts OFePPmZ1ViyZW253NeqpBwb0kZ1b1QP6VaQTteLKGxNFRqgJ3GjeE/tex0WyqzERSV G7gKBaYmCvhsA== Received: by pali.im (Postfix) id 9879F9D1; Thu, 20 May 2021 13:38:52 +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 v4 mvebu + mvebu/dt64 2/2] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file Date: Thu, 20 May 2021 13:38:44 +0200 Message-Id: <20210520113844.32319-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520113844.32319-1-pali@kernel.org> References: <20210308153703.23097-1-kabel@kernel.org> <20210520113844.32319-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_043853_357178_40B097A8 X-CRM114-Status: GOOD ( 13.26 ) 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 ZmlybXdhcmUnIGluc3RlYWQgb2YgdGhlIGN1cnJlbnQgb25lLgoKVHVycmlzIE1PWCBEVFMgZmls ZSBjb250YWlucyBhbHNvIG9sZCBjb21wYXRpYmxlIHN0cmluZyBmb3IgYmFja3dhcmQKY29tcGF0 aWJpbGl0eS4KClRoZSBUdXJyaXMgTU9YIHJXVE0gZmlybXdhcmUgY2FuIGJlIHVzZWQgb24gYW55 IEFybWFkYSAzN3h4IGRldmljZSwKZ2l2aW5nIHRoZW0gYWNjZXNzIHRvIHRoZSByV1RNIGhhcmR3 YXJlIHJhbmRvbSBudW1iZXIgZ2VuZXJhdG9yLCB3aGljaAppcyBvdGhlcndpc2UgdW5hdmFpbGFi bGUuCgpUaGlzIGNoYW5nZSBhbGxvd3MgTGludXggdG8gbG9hZCB0aGUgdHVycmlzLW1veC1yd3Rt LmtvIG1vZHVsZSBvbiB0aGVzZQpib2FyZHMuCgpUZXN0ZWQgb24gRVNQUkVTU09iaW4gdjUgd2l0 aCBib3RoIGRlZmF1bHQgTWFydmVsbCBXVE1JIGZpcm13YXJlIGFuZApDWi5OSUMncyBmaXJtd2Fy ZS4gV2l0aCBkZWZhdWx0IFdUTUkgZmlybXdhcmUgdGhlIHR1cnJpcy1tb3gtcnd0bSBmYWlscwp0 byBwcm9iZSwgd2hpbGUgd2l0aCBDWi5OSUMncyBmaXJtd2FyZSBpdCByZWdpc3RlcnMgdGhlIEhX IHJhbmRvbSBudW1iZXIKZ2VuZXJhdG9yLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBh bGlAa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogTWFyZWsgQmVow7puIDxrYWJlbEBrZXJuZWwu b3JnPgpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMgNS40KzogNDZkMmY2ZDBjOTlmICgi YXJtNjQ6IGR0czogYXJtYWRhLTM3MjAtdHVycmlzLW1veDogYWRkIGZpcm13YXJlIG5vZGUiKQot LS0KIGFyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC10dXJyaXMtbW94LmR0 cyB8IDYgKystLS0tCiBhcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3eHguZHRz aSAgICAgICAgICAgfCA4ICsrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2 ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2 ZWxsL2FybWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzCmluZGV4IDA3NTNjYzQ4OTYzOC4uNjcwMGYy MjEyYjYxIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3 MjAtdHVycmlzLW1veC5kdHMKKysrIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFk YS0zNzIwLXR1cnJpcy1tb3guZHRzCkBAIC0xMDksMTAgKzEwOSw4IEBACiAJfTsKIAogCWZpcm13 YXJlIHsKLQkJdHVycmlzLW1veC1yd3RtIHsKLQkJCWNvbXBhdGlibGUgPSAiY3puaWMsdHVycmlz LW1veC1yd3RtIjsKLQkJCW1ib3hlcyA9IDwmcnd0bSAwPjsKLQkJCXN0YXR1cyA9ICJva2F5IjsK KwkJYXJtYWRhLTM3MDAtcnd0bSB7CisJCQljb21wYXRpYmxlID0gIm1hcnZlbGwsYXJtYWRhLTM3 MDAtcnd0bS1maXJtd2FyZSIsICJjem5pYyx0dXJyaXMtbW94LXJ3dG0iOwogCQl9OwogCX07CiB9 OwpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zN3h4LmR0 c2kgYi9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3eHguZHRzaQppbmRleCAx YjdmNDNlMjc1ODkuLjg0N2EyZDEyYTRiZSAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9ib290L2R0 cy9tYXJ2ZWxsL2FybWFkYS0zN3h4LmR0c2kKKysrIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2 ZWxsL2FybWFkYS0zN3h4LmR0c2kKQEAgLTUwNSw0ICs1MDUsMTIgQEAKIAkJCX07CiAJCX07CiAJ fTsKKworCWZpcm13YXJlIHsKKwkJYXJtYWRhLTM3MDAtcnd0bSB7CisJCQljb21wYXRpYmxlID0g Im1hcnZlbGwsYXJtYWRhLTM3MDAtcnd0bS1maXJtd2FyZSI7CisJCQltYm94ZXMgPSA8JnJ3dG0g MD47CisJCQlzdGF0dXMgPSAib2theSI7CisJCX07CisJfTsKIH07Ci0tIAoyLjIwLjEKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2Vy bmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0 cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVs Cg== 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.4 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 0CFFBC41603 for ; Thu, 20 May 2021 11:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E53C0613AE for ; Thu, 20 May 2021 11:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243852AbhETLvJ (ORCPT ); Thu, 20 May 2021 07:51:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:58364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242607AbhETLkO (ORCPT ); Thu, 20 May 2021 07:40:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D73DF61057; Thu, 20 May 2021 11:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621510733; bh=vlHTNsPasjda2fZpQUYmE5kVMjIxEDkJ+IuDW3NomvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXSunl/kzCfQEcgu366I8FZ9Hf6mzr94R6r1XFejwIi0A6XRKBxqdDQyLJJ03Zgrf iVSG6By3JNbrGnxZaXQbayHXUOGtmL1iiqVkIAgQuJjYh+7PPOte1VXwCRGEzSEZJi s4EC9ABNINMLRsNOZsx3aK1JwWMcncCMO3x8+l3gbhYFufwcITYC+fiEGKskSsOpH2 yZeX4a43dbqZLc0q7uHwtee+phzxCIbpPiqBdLZahC3KHDRSp5TCVLTGem/Jbpe2ts OFePPmZ1ViyZW253NeqpBwb0kZ1b1QP6VaQTteLKGxNFRqgJ3GjeE/tex0WyqzERSV G7gKBaYmCvhsA== Received: by pali.im (Postfix) id 9879F9D1; Thu, 20 May 2021 13:38:52 +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 v4 mvebu + mvebu/dt64 2/2] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file Date: Thu, 20 May 2021 13:38:44 +0200 Message-Id: <20210520113844.32319-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520113844.32319-1-pali@kernel.org> References: <20210308153703.23097-1-kabel@kernel.org> <20210520113844.32319-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. 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 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 | 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 0753cc489638..6700f2212b61 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -109,10 +109,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 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