Skip to content

Commit 9bd9a06

Browse files
ardbiesheuvelarndb
authored andcommitted
dt: amd-seattle: upgrade AMD Seattle XGBE to new SMMU binding
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> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent f179eb6 commit 9bd9a06

1 file changed

Lines changed: 8 additions & 14 deletions

File tree

arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
clocks = <&xgmacclk0_dma_250mhz>, <&xgmacclk0_ptp_250mhz>;
5656
clock-names = "dma_clk", "ptp_clk";
5757
phy-mode = "xgmii";
58-
#stream-id-cells = <16>;
58+
iommus = <&xgmac0_smmu 0x00 0x17>; /* 0-7, 16-23 */
5959
dma-coherent;
6060
};
6161

@@ -81,11 +81,11 @@
8181
clocks = <&xgmacclk1_dma_250mhz>, <&xgmacclk1_ptp_250mhz>;
8282
clock-names = "dma_clk", "ptp_clk";
8383
phy-mode = "xgmii";
84-
#stream-id-cells = <16>;
84+
iommus = <&xgmac1_smmu 0x00 0x17>; /* 0-7, 16-23 */
8585
dma-coherent;
8686
};
8787

88-
xgmac0_smmu: smmu@e0600000 {
88+
xgmac0_smmu: iommu@e0600000 {
8989
compatible = "arm,mmu-401";
9090
reg = <0 0xe0600000 0 0x10000>;
9191
#global-interrupts = <1>;
@@ -94,14 +94,11 @@
9494
*/
9595
<0 336 4>,
9696
<0 336 4>;
97-
98-
mmu-masters = <&xgmac0
99-
0 1 2 3 4 5 6 7
100-
16 17 18 19 20 21 22 23
101-
>;
97+
#iommu-cells = <2>;
98+
dma-coherent;
10299
};
103100

104-
xgmac1_smmu: smmu@e0800000 {
101+
xgmac1_smmu: iommu@e0800000 {
105102
compatible = "arm,mmu-401";
106103
reg = <0 0xe0800000 0 0x10000>;
107104
#global-interrupts = <1>;
@@ -110,9 +107,6 @@
110107
*/
111108
<0 335 4>,
112109
<0 335 4>;
113-
114-
mmu-masters = <&xgmac1
115-
0 1 2 3 4 5 6 7
116-
16 17 18 19 20 21 22 23
117-
>;
110+
#iommu-cells = <2>;
111+
dma-coherent;
118112
};

0 commit comments

Comments
 (0)