From patchwork Wed Feb 26 21:47:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13993239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C25FC021B8 for ; Wed, 26 Feb 2025 21:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=hqasg0Pp4KnaZYEOUtHXlCbYHrtQGsgteP6GD2YNVzc=; b=WWxxYocrEiPETnt0IQuIjyhMPQ b/XTV4b4WM5SYXrbeM7R2Hhxz/PR4FWm28HR4tTmwSGQvD/hjcLam3EoqhbLx8gU0PVrCWUF7WZtP pC1kwhKfZGOwo7/2SSMyZYlPCzyEUn4CLF27ATW41h7jphAnf2xFAM1WxzTq5B4oAtfuJugAP7G5s wUe1OB7JfBxLYI+60CCXnxBVXXV0y7sHJiDCFP/tTy2IGTSLc6yrz05KJr/YFb5M7zb99ShddCv43 nwh3V7x6DMDJXgLK2rfrHNjyQsy5ifx31nEKWC62WBBcbv8aQinWCYyYQkciYOY6IU6wMY7E8PVwN Ssw1mTjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tnPHk-00000005WUd-1sso; Wed, 26 Feb 2025 21:49:44 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnPGC-00000005WAc-1Xp6 for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2025 21:48:09 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E48495C72C8; Wed, 26 Feb 2025 21:47:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33FA4C4CEE7; Wed, 26 Feb 2025 21:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740606487; bh=NdZQtJa0ZOh04+9rg2b+zZfqMIh7fGLxHzRoGo/wQPU=; h=From:To:Cc:Subject:Date:From; b=hJ/wYJ72T5RjKXMzhBQJarDAqsDZESzXnWGIjAbWtskg4RFrSB1wSsRzLLfPPFmHd 5/ov6wSvD3YRa31Acss5MehJj3HvVsIf5wBLA4ewCwy6PwlHUCiSg+RsvGkTh3WbhC ZLPnew8efhF0m/r613hL1raarFRkutVCivDeeoBHPQcay7UXwDpGmzDDkbM1/EVfvN udlPIhr9CJz1HIO0uq9mERN9PHo/3xTE7M+pd8i6fiqta6dq/SkAbbRJgDioD/x37Q K6On/LrCyU36pLcSw5hTrV2OKUd4VbsdZbD7mwxtMxJAvJT0MagtYKC/ha7yVPFX6l aW90udr+qvjQg== From: "Rob Herring (Arm)" To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] arm64: dts: marvell: Move arch timer and pmu nodes to top-level Date: Wed, 26 Feb 2025 15:47:47 -0600 Message-ID: <20250226214751.3751865-1-robh@kernel.org> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250226_134808_495832_77C69EAD X-CRM114-Status: UNSURE ( 9.56 ) X-CRM114-Notice: Please train this message. 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 The Arm arch timer and PMU are not memory-mapped peripherals, and therefore should not be under a "simple-bus" node. Move them to the top-level like other platforms. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 29 ++++++++++--------- .../boot/dts/marvell/armada-ap810-ap0.dtsi | 18 ++++++------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi index fdf88cd0eb02..e206d03a2867 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi @@ -48,6 +48,21 @@ tee@4400000 { }; }; + timer { + compatible = "arm,armv8-timer"; + interrupt-parent = <&gic>; + interrupts = , + , + , + ; + }; + + pmu { + compatible = "arm,cortex-a72-pmu"; + interrupt-parent = <&pic>; + interrupts = <17>; + }; + AP_NAME { #address-cells = <2>; #size-cells = <2>; @@ -122,20 +137,6 @@ gic_v2m3: v2m@2b0000 { }; }; - timer { - compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; - }; - - pmu { - compatible = "arm,cortex-a72-pmu"; - interrupt-parent = <&pic>; - interrupts = <17>; - }; - odmi: odmi@300000 { compatible = "marvell,odmi-controller"; msi-controller; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi index 2f9ab6b4a2c9..f5a89af154d4 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi @@ -14,6 +14,7 @@ / { compatible = "marvell,armada-ap810"; #address-cells = <2>; #size-cells = <2>; + interrupt-parent = <&gic>; aliases { serial0 = &uart0_ap0; @@ -25,11 +26,18 @@ psci { method = "smc"; }; + timer { + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + }; + ap810-ap0 { #address-cells = <2>; #size-cells = <2>; compatible = "simple-bus"; - interrupt-parent = <&gic>; ranges; config-space@e8000000 { @@ -62,14 +70,6 @@ gic_its_ap0: msi-controller@3040000 { }; }; - timer { - compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; - }; - xor@400000 { compatible = "marvell,armada-7k-xor", "marvell,xor-v2"; reg = <0x400000 0x1000>, From patchwork Wed Feb 26 21:47:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13993242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC2ABC021B8 for ; Wed, 26 Feb 2025 21:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f9xgh8B/zm8/WChqwo53t1sfyOGDRUQkCddaF7RwrIM=; b=UO1rZ5WFbsRx8TQ32Fnt9lcXen ayV67NZVgazrgH3QRYKUx54M1hCa3+ZoYlKy29IqYv05ye7RLVRgjFBmz7CfeyJf+P2ufMezO+hNv XWjrx7mEFaRe9WiZTuNtZogFY0gu1nQ9DaI6XCsOP4hIXQzN4y5q793+/UchcNEA64gftIZO3E17Q HmIkhvy3zJ/Dh310lf/4Hl8A1ovcfJbKTtPB6NWW4UyfEYa/JQdgLwI36q4d6k76XTgvRxnuRztfl 7SqvfgXeS7OMUV1YKwDCjXKT+N2D2Hs4kpPYlZvRiimiyQSU4QGVN6pp3dkJZDh/7PImmZhStrYXF CtcflrSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tnPJF-00000005WgJ-0U7e; Wed, 26 Feb 2025 21:51:17 +0000 Received: from tor.source.kernel.org ([2600:3c04::f03c:95ff:fe5e:7468]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnPGE-00000005WBA-3NgC for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2025 21:48:10 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 314B26122D; Wed, 26 Feb 2025 21:48:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97680C4CED6; Wed, 26 Feb 2025 21:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740606489; bh=82kYuqeQF4R2/TZndohz5T6rtlxiysXvknNQ+xYTXkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z3SWNmOjgQVTaZPw6vTmYYxHVNe7pMDk/O97umAWUKJAPVFc1+PqXsd8Viy7ALmUw PU+9RkHbwcIk5zp5qed9myqLGNLU2XQMFLqbx3UMYEfKdi34Gnb8SsmcnMCWu2pETb D0D9e5At8Vak/FQLgYWBEV27rKBQmzUJUnLrKrHK+JNvEmhd8I7xrDRpqdMLwSStAM YKhLrnOTPRYyTBqPyXY5KEnaQRjYBQJgREepppBtVpYpQhMpsPXX3D3s9P+HmQPLL0 /GO7TWp9bXenhz+uv/vaZXfOh4WIRIrJRzH3GnecnE2pOote5wFoPR+XRw9/ogx4am R5+L87bnGIoJA== From: "Rob Herring (Arm)" To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] arm64: dts: marvell: Drop unused CP11X_TYPE define Date: Wed, 26 Feb 2025 15:47:48 -0600 Message-ID: <20250226214751.3751865-2-robh@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250226214751.3751865-1-robh@kernel.org> References: <20250226214751.3751865-1-robh@kernel.org> MIME-Version: 1.0 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 The CP11X_TYPE define is not used anywhere, remove it. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 4 ---- arch/arm64/boot/dts/marvell/armada-cp115.dtsi | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 4fd33b0fa56e..e3cfd168becc 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -5,8 +5,4 @@ * Device Tree file for Marvell Armada CP110. */ -#define CP11X_TYPE cp110 - #include "armada-cp11x.dtsi" - -#undef CP11X_TYPE diff --git a/arch/arm64/boot/dts/marvell/armada-cp115.dtsi b/arch/arm64/boot/dts/marvell/armada-cp115.dtsi index 1d0a9653e681..ec6432c8db7c 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp115.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp115.dtsi @@ -5,8 +5,4 @@ * Device Tree file for Marvell Armada CP115. */ -#define CP11X_TYPE cp115 - #include "armada-cp11x.dtsi" - -#undef CP11X_TYPE From patchwork Wed Feb 26 21:47:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13993243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F8B5C021B8 for ; Wed, 26 Feb 2025 21:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZxsrscezGJubm7rUM85ZXAPnCpHiDmg3Kn4JohLNs14=; b=v++M01fETd5Kl/E0vRNQp9Dbxz Vb8U9U498GNyW8PmgW+k1BAUhoMpjrxNhppNizJTYu2GZnNxJBUTmbyW359/nLF3NSB3GSnnQPmv9 7WiHBUot93XC2QJkmteahQxDLC++15/J5mKgD2uIxt8Ni5Ua7wtotgq1QDUHhvRJW4W4gCRHZP5S7 p8RFody9NKNApXnMtlfL0X1nfNnLskncy0+8ATN+jojriOafo0P+jaIo3+4nx7v5adsU98cDmabac /nY/wpHpmhfou0JlPsYB8aocbzUOLKoXx9PGG6aXf4cMGBq8MFPrlBZJX9qRLHuwX14qGnYm5Ba5e /B9Gso8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tnPKk-00000005Wsj-3DRa; Wed, 26 Feb 2025 21:52:50 +0000 Received: from tor.source.kernel.org ([2600:3c04::f03c:95ff:fe5e:7468]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnPGH-00000005WBb-1Sc0 for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2025 21:48:13 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id CC0B36122D; Wed, 26 Feb 2025 21:48:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46F00C4CEE7; Wed, 26 Feb 2025 21:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740606492; bh=J57eJSnjO9hXPRLMhrrFdrkaisb+OAmoFXPVZ3hF/jI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NWY08T6vgHpnlSjh0KJs2h8tm5GRSji3ze++I1jgIbPZtxMJZNeNcQlT0OQC8rvN/ f8Qg6RYbOoUHcelW/Ouexvoh+8UC+GBLAMZHyLAbqokvUxv2ODzND/hIgLuTkPIj+0 JkB1W1+Pp2fLtSfbpFAydneyD8icWy3ORUfqVG+4Qq0dWt/tjFArdTBdYIexF5p3kO QFdzQS3kRadOu9dcusq28grytgPTC5tkkxbPL5xo1/8WW2xMYolJ1YEOrZsdn8QiES +izQB/pEhFtlXgQpSb8MfiFzBP7Egwnr6EgC92diAh/aK8CMkIAu5nGa3SqBRhIW8E ou5kM4D4cJilA== From: "Rob Herring (Arm)" To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] arm64: dts: marvell: Use preferred node names for "simple-bus" Date: Wed, 26 Feb 2025 15:47:49 -0600 Message-ID: <20250226214751.3751865-3-robh@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250226214751.3751865-1-robh@kernel.org> References: <20250226214751.3751865-1-robh@kernel.org> MIME-Version: 1.0 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 The "simple-bus" binding has preferred node names such as "bus", ".*-bus", or "soc". Rename the Marvell platforms to use these names. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 4 ++-- arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 4 ++-- arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 4 ++-- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi index 75377c292bcb..605f5be1538c 100644 --- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi @@ -78,7 +78,7 @@ soc { #size-cells = <2>; ranges; - internal-regs@7f000000 { + bus@7f000000 { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 9603223dd761..6ec22eaaf816 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -78,7 +78,7 @@ soc { #size-cells = <2>; ranges; - internal-regs@d0000000 { + bus@d0000000 { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi index 866628679ac7..e421d454daa7 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi @@ -5,7 +5,6 @@ * Device Tree file for Marvell Armada AP806. */ -#define AP_NAME ap806 #include "armada-ap80x.dtsi" / { diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi index a3328d05fc94..7150ce83abf2 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi @@ -5,7 +5,6 @@ * Copyright (C) 2019 Marvell Technology Group Ltd. */ -#define AP_NAME ap807 #include "armada-ap80x.dtsi" / { diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi index e206d03a2867..40e146982921 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi @@ -63,14 +63,14 @@ pmu { interrupts = <17>; }; - AP_NAME { + soc { #address-cells = <2>; #size-cells = <2>; compatible = "simple-bus"; interrupt-parent = <&gic>; ranges; - config-space@f0000000 { + bus@f0000000 { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi index f5a89af154d4..a143d84bcf23 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi @@ -34,13 +34,13 @@ timer { ; }; - ap810-ap0 { + soc { #address-cells = <2>; #size-cells = <2>; compatible = "simple-bus"; ranges; - config-space@e8000000 { + bus@e8000000 { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 161beec0b6b0..a057e119492f 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -17,7 +17,7 @@ / { * The contents of the node are defined below, in order to * save one indentation level */ - CP11X_NAME: CP11X_NAME { }; + CP11X_NAME: CP11X_NODE_NAME(bus) { }; /* * CPs only have one sensor in the thermal IC. @@ -51,7 +51,7 @@ &CP11X_NAME { interrupt-parent = <&CP11X_LABEL(icu_nsr)>; ranges; - config-space@CP11X_BASE { + bus@CP11X_BASE { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus";