From patchwork Thu Apr 29 08:36:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 12230791 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.2 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 C81CCC433ED for ; Thu, 29 Apr 2021 08:39:19 +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 1A2166135B for ; Thu, 29 Apr 2021 08:39:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A2166135B 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=QjktsRfX1AFG6BCVrmyvuZsPr xeDB4B08AR1XJUy/mYjHRr4ceecf4PYCGJsxm51YLl33JUkBS52b8lQn0k0Cg39RbVLVavVqq/sAZ BcFI7ds4PdB2BYmtG0VW3rTwjZKh6Wdl952MqWcWNHts3D2GKtkMxTIMqKbxHpSzq89TJcpVKL+fe OfTwIp/5zgIdnEnqewN4cvxBQQ2OXwk08UT3u9h/9w4n6fyFlZ6Znn2J2eTkp48PcXcdmKinQOvvX iYy2HPq5UCuOODVvg31EuX0Mzc3Fw50gW3NxUn+xj5wk+Zeerq+3eeXDEFSM11tXTIPti9ET7xkeX Up3MyF7/A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lc2BA-005KKc-U5; Thu, 29 Apr 2021 08:37:49 +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 1lc2As-005KFx-7m for linux-arm-kernel@desiato.infradead.org; Thu, 29 Apr 2021 08:37:30 +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=S0yHtUFby3f3n9wd03sKsiquQf lAmhA6C+QEXvgI2pq3hSOfvv4hPugFBQVQupmkOImdfDq2YXhYB6INp3t5IjXH9ih5UpMMRP3nVJR ekZAl7GeEZL1/1lsvch7oz127LnwvvDB6sGYOVrv/wHU5JrIExV8Z8Xwi2YlRY2KIMNHjrYmi1m59 VrQuhT0JpssZePa8S0PTOUdV2Zxq4ihskzRUdxFfyNlk8qGNghw4CyiY22NzINvsTJ6qA/vFIZZwo Sp8Tr7dbo3KvbGyrpmcx9HbDz6ZQJwS7FSgzFnMxkn2g+d2hlaqg0uVWLL6+TVOVXi0bZNZuA0Hu7 3HQWmfWw==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lc2Ap-000Ubx-Pi for linux-arm-kernel@lists.infradead.org; Thu, 29 Apr 2021 08:37:29 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 124A5613CC; Thu, 29 Apr 2021 08:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619685447; bh=HaAfWtOAafkNSsvz88e84TAEk52kR7zNGm+Hs1lufVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9cwET2lfBWx4z21Rbb5XQMMhagUx2mZffCLo2Lp3v/hzb4OAB6NrKG31LTSxwiKc lVch/kCh8FFLY5N9U5tNB9qh03SCzDBRwkuYoMM206585XP4FdSHs8ux+y3jD1Wt9l HiH+s+W2q5JX1mo5P7mLWnVKEHCT5wf9OfNl3//yR3epiOmS3Ub3Jmnkg8IVKOJCV/ fZsDZEsCMLNF2+R8iihbHsEw0q1B/uYa29DsAom/etGTcGe6qoFnnBH2HqDWiyuIZ1 r68ti6+chgwa5tf+bOYsDae1tsDYvngA+sdcim/uCP2r9VCopjnqL5zV0jkKjddaMy 8XEt2Nr8sbvgQ== Received: by pali.im (Postfix) id C4B347DF; Thu, 29 Apr 2021 10:37:24 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Gregory CLEMENT , Andrew Lunn Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 mvebu + mvebu/dt64 6/6] arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file Date: Thu, 29 Apr 2021 10:36:36 +0200 Message-Id: <20210429083636.22560-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210429083636.22560-1-pali@kernel.org> References: <20210308153703.23097-1-kabel@kernel.org> <20210429083636.22560-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210429_013727_890052_A4228C17 X-CRM114-Status: GOOD ( 13.97 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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"; + }; + }; };