Skip to content

Commit f847a3a

Browse files
arinc9mbgg
authored andcommitted
arm: dts: mt7623: add gmacs to mt7623.dtsi
There are two gigabit MACs on the MT7623AI and MT7623NI SoCs. Add them to mt7623.dtsi and adjust the DTs that call mt7623.dtsi. Now that there are labels for the MACs, remove them from under &eth on the DTs that call mt7623.dtsi. Remove the unnecessary mdio label from Bananapi BPI-R2. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> Link: https://lore.kernel.org/r/20230210182505.24597-2-arinc.unal@arinc9.com Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
1 parent ac9a786 commit f847a3a

5 files changed

Lines changed: 58 additions & 51 deletions

File tree

arch/arm/boot/dts/mt7623.dtsi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,18 @@
980980
#address-cells = <1>;
981981
#size-cells = <0>;
982982
status = "disabled";
983+
984+
gmac0: mac@0 {
985+
compatible = "mediatek,eth-mac";
986+
reg = <0>;
987+
status = "disabled";
988+
};
989+
990+
gmac1: mac@1 {
991+
compatible = "mediatek,eth-mac";
992+
reg = <1>;
993+
status = "disabled";
994+
};
983995
};
984996

985997
crypto: crypto@1b240000 {

arch/arm/boot/dts/mt7623a-rfb-emmc.dts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,19 @@
112112
status = "okay";
113113
};
114114

115-
&eth {
115+
&gmac0 {
116116
status = "okay";
117+
phy-mode = "trgmii";
117118

118-
gmac0: mac@0 {
119-
compatible = "mediatek,eth-mac";
120-
reg = <0>;
121-
phy-mode = "trgmii";
122-
123-
fixed-link {
124-
speed = <1000>;
125-
full-duplex;
126-
pause;
127-
};
119+
fixed-link {
120+
speed = <1000>;
121+
full-duplex;
122+
pause;
128123
};
124+
};
125+
126+
&eth {
127+
status = "okay";
129128

130129
mdio-bus {
131130
#address-cells = <1>;

arch/arm/boot/dts/mt7623a-rfb-nand.dts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,19 @@
116116
status = "okay";
117117
};
118118

119-
&eth {
119+
&gmac0 {
120120
status = "okay";
121+
phy-mode = "trgmii";
121122

122-
gmac0: mac@0 {
123-
compatible = "mediatek,eth-mac";
124-
reg = <0>;
125-
phy-mode = "trgmii";
126-
127-
fixed-link {
128-
speed = <1000>;
129-
full-duplex;
130-
pause;
131-
};
123+
fixed-link {
124+
speed = <1000>;
125+
full-duplex;
126+
pause;
132127
};
128+
};
129+
130+
&eth {
131+
status = "okay";
133132

134133
mdio-bus {
135134
#address-cells = <1>;

arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,21 @@
171171
};
172172
};
173173

174-
&eth {
174+
&gmac0 {
175175
status = "okay";
176+
phy-mode = "trgmii";
176177

177-
gmac0: mac@0 {
178-
compatible = "mediatek,eth-mac";
179-
reg = <0>;
180-
phy-mode = "trgmii";
181-
182-
fixed-link {
183-
speed = <1000>;
184-
full-duplex;
185-
pause;
186-
};
178+
fixed-link {
179+
speed = <1000>;
180+
full-duplex;
181+
pause;
187182
};
183+
};
184+
185+
&eth {
186+
status = "okay";
188187

189-
mdio: mdio-bus {
188+
mdio-bus {
190189
#address-cells = <1>;
191190
#size-cells = <0>;
192191

arch/arm/boot/dts/mt7623n-rfb-emmc.dts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,27 +156,25 @@
156156
};
157157
};
158158

159-
&eth {
159+
&gmac0 {
160160
status = "okay";
161+
phy-mode = "trgmii";
161162

162-
gmac0: mac@0 {
163-
compatible = "mediatek,eth-mac";
164-
reg = <0>;
165-
phy-mode = "trgmii";
166-
167-
fixed-link {
168-
speed = <1000>;
169-
full-duplex;
170-
pause;
171-
};
163+
fixed-link {
164+
speed = <1000>;
165+
full-duplex;
166+
pause;
172167
};
168+
};
173169

174-
mac@1 {
175-
compatible = "mediatek,eth-mac";
176-
reg = <1>;
177-
phy-mode = "rgmii";
178-
phy-handle = <&phy5>;
179-
};
170+
&gmac1 {
171+
status = "okay";
172+
phy-mode = "rgmii";
173+
phy-handle = <&phy5>;
174+
};
175+
176+
&eth {
177+
status = "okay";
180178

181179
mdio-bus {
182180
#address-cells = <1>;

0 commit comments

Comments
 (0)