Skip to content

Commit 87e1f5e

Browse files
mripardmripard
committed
arm64: dts: allwinner: Revert EMAC changes
Since the discussion is not settled yet for the EMAC, and that the release in getting really close, let's revert the changes for now, and we'll reintroduce them later. Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
1 parent 8aa33ec commit 87e1f5e

8 files changed

+0
-135
lines changed

‎arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";
5252

5353
aliases {
54-
ethernet0 = &emac;
5554
serial0 = &uart0;
5655
serial1 = &uart1;
5756
};
@@ -68,14 +67,6 @@
6867
};
6968
};
7069

71-
&emac {
72-
pinctrl-names = "default";
73-
pinctrl-0 = <&rgmii_pins>;
74-
phy-mode = "rgmii";
75-
phy-handle = <&ext_rgmii_phy>;
76-
status = "okay";
77-
};
78-
7970
&i2c1 {
8071
pinctrl-names = "default";
8172
pinctrl-0 = <&i2c1_pins>;
@@ -86,13 +77,6 @@
8677
bias-pull-up;
8778
};
8879

89-
&mdio {
90-
ext_rgmii_phy: ethernet-phy@1 {
91-
compatible = "ethernet-phy-ieee802.3-c22";
92-
reg = <1>;
93-
};
94-
};
95-
9680
&mmc0 {
9781
pinctrl-names = "default";
9882
pinctrl-0 = <&mmc0_pins>;

‎arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,3 @@
4848

4949
/* TODO: Camera, touchscreen, etc. */
5050
};
51-
52-
&emac {
53-
pinctrl-names = "default";
54-
pinctrl-0 = <&rgmii_pins>;
55-
phy-mode = "rgmii";
56-
phy-handle = <&ext_rgmii_phy>;
57-
status = "okay";
58-
};
59-
60-
&mdio {
61-
ext_rgmii_phy: ethernet-phy@1 {
62-
compatible = "ethernet-phy-ieee802.3-c22";
63-
reg = <1>;
64-
};
65-
};

‎arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
compatible = "pine64,pine64", "allwinner,sun50i-a64";
5252

5353
aliases {
54-
ethernet0 = &emac;
5554
serial0 = &uart0;
5655
serial1 = &uart1;
5756
serial2 = &uart2;
@@ -79,15 +78,6 @@
7978
status = "okay";
8079
};
8180

82-
&emac {
83-
pinctrl-names = "default";
84-
pinctrl-0 = <&rmii_pins>;
85-
phy-mode = "rmii";
86-
phy-handle = <&ext_rmii_phy1>;
87-
status = "okay";
88-
89-
};
90-
9181
&i2c1 {
9282
pinctrl-names = "default";
9383
pinctrl-0 = <&i2c1_pins>;
@@ -98,13 +88,6 @@
9888
bias-pull-up;
9989
};
10090

101-
&mdio {
102-
ext_rmii_phy1: ethernet-phy@1 {
103-
compatible = "ethernet-phy-ieee802.3-c22";
104-
reg = <1>;
105-
};
106-
};
107-
10891
&mmc0 {
10992
pinctrl-names = "default";
11093
pinctrl-0 = <&mmc0_pins>;

‎arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
"allwinner,sun50i-a64";
5454

5555
aliases {
56-
ethernet0 = &emac;
5756
serial0 = &uart0;
5857
};
5958

@@ -77,21 +76,6 @@
7776
status = "okay";
7877
};
7978

80-
&emac {
81-
pinctrl-names = "default";
82-
pinctrl-0 = <&rgmii_pins>;
83-
phy-mode = "rgmii";
84-
phy-handle = <&ext_rgmii_phy>;
85-
status = "okay";
86-
};
87-
88-
&mdio {
89-
ext_rgmii_phy: ethernet-phy@1 {
90-
compatible = "ethernet-phy-ieee802.3-c22";
91-
reg = <1>;
92-
};
93-
};
94-
9579
&mmc2 {
9680
pinctrl-names = "default";
9781
pinctrl-0 = <&mmc2_pins>;

‎arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -449,26 +449,6 @@
449449
#size-cells = <0>;
450450
};
451451

452-
emac: ethernet@1c30000 {
453-
compatible = "allwinner,sun50i-a64-emac";
454-
syscon = <&syscon>;
455-
reg = <0x01c30000 0x10000>;
456-
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
457-
interrupt-names = "macirq";
458-
resets = <&ccu RST_BUS_EMAC>;
459-
reset-names = "stmmaceth";
460-
clocks = <&ccu CLK_BUS_EMAC>;
461-
clock-names = "stmmaceth";
462-
status = "disabled";
463-
#address-cells = <1>;
464-
#size-cells = <0>;
465-
466-
mdio: mdio {
467-
#address-cells = <1>;
468-
#size-cells = <0>;
469-
};
470-
};
471-
472452
gic: interrupt-controller@1c81000 {
473453
compatible = "arm,gic-400";
474454
reg = <0x01c81000 0x1000>,

‎arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";
5151

5252
aliases {
53-
ethernet0 = &emac;
5453
serial0 = &uart0;
5554
};
5655

@@ -109,22 +108,6 @@
109108
status = "okay";
110109
};
111110

112-
&emac {
113-
pinctrl-names = "default";
114-
pinctrl-0 = <&emac_rgmii_pins>;
115-
phy-supply = <&reg_gmac_3v3>;
116-
phy-handle = <&ext_rgmii_phy>;
117-
phy-mode = "rgmii";
118-
status = "okay";
119-
};
120-
121-
&mdio {
122-
ext_rgmii_phy: ethernet-phy@7 {
123-
compatible = "ethernet-phy-ieee802.3-c22";
124-
reg = <7>;
125-
};
126-
};
127-
128111
&mmc0 {
129112
pinctrl-names = "default";
130113
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

‎arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
};
6060

6161
aliases {
62-
ethernet0 = &emac;
6362
serial0 = &uart0;
6463
};
6564

@@ -137,28 +136,12 @@
137136
status = "okay";
138137
};
139138

140-
&emac {
141-
pinctrl-names = "default";
142-
pinctrl-0 = <&emac_rgmii_pins>;
143-
phy-supply = <&reg_gmac_3v3>;
144-
phy-handle = <&ext_rgmii_phy>;
145-
phy-mode = "rgmii";
146-
status = "okay";
147-
};
148-
149139
&ir {
150140
pinctrl-names = "default";
151141
pinctrl-0 = <&ir_pins_a>;
152142
status = "okay";
153143
};
154144

155-
&mdio {
156-
ext_rgmii_phy: ethernet-phy@1 {
157-
compatible = "ethernet-phy-ieee802.3-c22";
158-
reg = <1>;
159-
};
160-
};
161-
162145
&mmc0 {
163146
pinctrl-names = "default";
164147
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

‎arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5";
5555

5656
aliases {
57-
ethernet0 = &emac;
5857
serial0 = &uart0;
5958
};
6059

@@ -144,28 +143,12 @@
144143
status = "okay";
145144
};
146145

147-
&emac {
148-
pinctrl-names = "default";
149-
pinctrl-0 = <&emac_rgmii_pins>;
150-
phy-supply = <&reg_gmac_3v3>;
151-
phy-handle = <&ext_rgmii_phy>;
152-
phy-mode = "rgmii";
153-
status = "okay";
154-
};
155-
156146
&ir {
157147
pinctrl-names = "default";
158148
pinctrl-0 = <&ir_pins_a>;
159149
status = "okay";
160150
};
161151

162-
&mdio {
163-
ext_rgmii_phy: ethernet-phy@1 {
164-
compatible = "ethernet-phy-ieee802.3-c22";
165-
reg = <1>;
166-
};
167-
};
168-
169152
&mmc0 {
170153
pinctrl-names = "default";
171154
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

0 commit comments

Comments
 (0)