Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / amd / amd-seattle-xgbe-b.dtsi

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 d97498361ce3b7f6565030d766c4f8a45a624d18..9259e547e2e814d957b46804ea1d56078401d139 100644 (file)
--- 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,11 +81,11 @@
                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;
        };
 
-       xgmac0_smmu: smmu@e0600000 {
+       xgmac0_smmu: iommu@e0600000 {
                 compatible = "arm,mmu-401";
                 reg = <0 0xe0600000 0 0x10000>;
                 #global-interrupts = <1>;
@@ -94,14 +94,11 @@
                               */
                              <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>;
+               dma-coherent;
         };
 
-        xgmac1_smmu: smmu@e0800000 {
+        xgmac1_smmu: iommu@e0800000 {
                 compatible = "arm,mmu-401";
                 reg = <0 0xe0800000 0 0x10000>;
                 #global-interrupts = <1>;
@@ -110,9 +107,6 @@
                               */
                              <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>;
+               dma-coherent;
         };