All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ardb@kernel.org>
To: devicetree@vger.kernel.org
Cc: robh+dt@kernel.org, thomas.lendacky@amd.com,
	suravee.suthikulpanit@amd.com, brijeshkumar.singh@amd.com,
	will@kernel.org, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH 3/6] dt: amd-seattle: upgrade AMD Seattle XGBE to new SMMU binding
Date: Mon, 25 Nov 2019 23:51:07 +0100	[thread overview]
Message-ID: <20191125225110.10924-4-ardb@kernel.org> (raw)
In-Reply-To: <20191125225110.10924-1-ardb@kernel.org>

Upgrade the DT descriptions of the AMD Seattle XGBE network
controllers to use the current SMMU bindings.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
index d97498361ce3..fdebf78efa94 100644
--- a/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
+++ b/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
@@ -55,7 +55,7 @@
 		clocks = <&xgmacclk0_dma_250mhz>, <&xgmacclk0_ptp_250mhz>;
 		clock-names = "dma_clk", "ptp_clk";
 		phy-mode = "xgmii";
-		#stream-id-cells = <16>;
+		iommus = <&xgmac0_smmu 0x00 0x17>; /* 0-7, 16-23 */
 		dma-coherent;
 	};
 
@@ -81,7 +81,7 @@
 		clocks = <&xgmacclk1_dma_250mhz>, <&xgmacclk1_ptp_250mhz>;
 		clock-names = "dma_clk", "ptp_clk";
 		phy-mode = "xgmii";
-		#stream-id-cells = <16>;
+		iommus = <&xgmac1_smmu 0x00 0x17>; /* 0-7, 16-23 */
 		dma-coherent;
 	};
 
@@ -94,11 +94,7 @@
 			       */
 			      <0 336 4>,
 			      <0 336 4>;
-
-		 mmu-masters = <&xgmac0
-			  0  1  2  3  4  5  6  7
-			 16 17 18 19 20 21 22 23
-		 >;
+		#iommu-cells = <2>;
 	 };
 
 	 xgmac1_smmu: smmu@e0800000 {
@@ -110,9 +106,5 @@
 			       */
 			      <0 335 4>,
 			      <0 335 4>;
-
-		 mmu-masters = <&xgmac1
-			  0  1  2  3  4  5  6  7
-			 16 17 18 19 20 21 22 23
-		 >;
+		#iommu-cells = <2>;
 	 };
-- 
2.17.1


  parent reply	other threads:[~2019-11-25 22:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25 22:51 [PATCH 0/6] dt: amd-seattle: update SMMU and PCIe descriptions Ard Biesheuvel
2019-11-25 22:51 ` [PATCH 1/6] dt: amd-seattle: remove Husky platform Ard Biesheuvel
2019-11-25 22:51 ` [PATCH 2/6] dt: amd-seattle: remove Overdrive revision A0 support Ard Biesheuvel
2019-11-25 22:51 ` Ard Biesheuvel [this message]
2019-11-25 22:51 ` [PATCH 4/6] dt: amd-seattle: fix PCIe legacy interrupt routing Ard Biesheuvel
2019-11-25 22:51 ` [PATCH 5/6] dt: amd-seattle: add a description of the PCIe SMMU Ard Biesheuvel
2019-11-25 22:51 ` [PATCH 6/6] dt: amd-seattle: add description of the SATA/CCP SMMUs Ard Biesheuvel
2019-11-26  8:46 ` [PATCH 0/6] dt: amd-seattle: update SMMU and PCIe descriptions Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191125225110.10924-4-ardb@kernel.org \
    --to=ardb@kernel.org \
    --cc=brijeshkumar.singh@amd.com \
    --cc=devicetree@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=thomas.lendacky@amd.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.