Skip to content

Commit fe45174

Browse files
mripardmripard
committed
arm: dts: sunxi: 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 87e1f5e commit fe45174

10 files changed

+0
-128
lines changed

‎arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656

5757
aliases {
5858
serial0 = &uart0;
59-
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
60-
ethernet0 = &emac;
6159
ethernet1 = &xr819;
6260
};
6361

@@ -104,13 +102,6 @@
104102
status = "okay";
105103
};
106104

107-
&emac {
108-
phy-handle = <&int_mii_phy>;
109-
phy-mode = "mii";
110-
allwinner,leds-active-low;
111-
status = "okay";
112-
};
113-
114105
&mmc0 {
115106
pinctrl-names = "default";
116107
pinctrl-0 = <&mmc0_pins_a>;

‎arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";
5353

5454
aliases {
55-
ethernet0 = &emac;
5655
serial0 = &uart0;
5756
serial1 = &uart1;
5857
};
@@ -115,30 +114,12 @@
115114
status = "okay";
116115
};
117116

118-
&emac {
119-
pinctrl-names = "default";
120-
pinctrl-0 = <&emac_rgmii_pins>;
121-
phy-supply = <&reg_gmac_3v3>;
122-
phy-handle = <&ext_rgmii_phy>;
123-
phy-mode = "rgmii";
124-
125-
allwinner,leds-active-low;
126-
status = "okay";
127-
};
128-
129117
&ir {
130118
pinctrl-names = "default";
131119
pinctrl-0 = <&ir_pins_a>;
132120
status = "okay";
133121
};
134122

135-
&mdio {
136-
ext_rgmii_phy: ethernet-phy@1 {
137-
compatible = "ethernet-phy-ieee802.3-c22";
138-
reg = <0>;
139-
};
140-
};
141-
142123
&mmc0 {
143124
pinctrl-names = "default";
144125
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

‎arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,3 @@
4646
model = "FriendlyARM NanoPi NEO";
4747
compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
4848
};
49-
50-
&emac {
51-
phy-handle = <&int_mii_phy>;
52-
phy-mode = "mii";
53-
allwinner,leds-active-low;
54-
status = "okay";
55-
};

‎arch/arm/boot/dts/sun8i-h3-orangepi-2.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
aliases {
5555
serial0 = &uart0;
5656
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
57-
ethernet0 = &emac;
5857
ethernet1 = &rtl8189;
5958
};
6059

@@ -118,13 +117,6 @@
118117
status = "okay";
119118
};
120119

121-
&emac {
122-
phy-handle = <&int_mii_phy>;
123-
phy-mode = "mii";
124-
allwinner,leds-active-low;
125-
status = "okay";
126-
};
127-
128120
&ir {
129121
pinctrl-names = "default";
130122
pinctrl-0 = <&ir_pins_a>;

‎arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
compatible = "xunlong,orangepi-one", "allwinner,sun8i-h3";
5353

5454
aliases {
55-
ethernet0 = &emac;
5655
serial0 = &uart0;
5756
};
5857

@@ -98,13 +97,6 @@
9897
status = "okay";
9998
};
10099

101-
&emac {
102-
phy-handle = <&int_mii_phy>;
103-
phy-mode = "mii";
104-
allwinner,leds-active-low;
105-
status = "okay";
106-
};
107-
108100
&mmc0 {
109101
pinctrl-names = "default";
110102
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

‎arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
};
5454
};
5555

56-
&emac {
57-
/* LEDs changed to active high on the plus */
58-
/delete-property/ allwinner,leds-active-low;
59-
};
60-
6156
&mmc1 {
6257
pinctrl-names = "default";
6358
pinctrl-0 = <&mmc1_pins_a>;

‎arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
compatible = "xunlong,orangepi-pc", "allwinner,sun8i-h3";
5353

5454
aliases {
55-
ethernet0 = &emac;
5655
serial0 = &uart0;
5756
};
5857

@@ -114,13 +113,6 @@
114113
status = "okay";
115114
};
116115

117-
&emac {
118-
phy-handle = <&int_mii_phy>;
119-
phy-mode = "mii";
120-
allwinner,leds-active-low;
121-
status = "okay";
122-
};
123-
124116
&ir {
125117
pinctrl-names = "default";
126118
pinctrl-0 = <&ir_pins_a>;

‎arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
model = "Xunlong Orange Pi Plus / Plus 2";
4848
compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3";
4949

50-
aliases {
51-
ethernet0 = &emac;
52-
};
53-
5450
reg_gmac_3v3: gmac-3v3 {
5551
compatible = "regulator-fixed";
5652
regulator-name = "gmac-3v3";
@@ -78,24 +74,6 @@
7874
status = "okay";
7975
};
8076

81-
&emac {
82-
pinctrl-names = "default";
83-
pinctrl-0 = <&emac_rgmii_pins>;
84-
phy-supply = <&reg_gmac_3v3>;
85-
phy-handle = <&ext_rgmii_phy>;
86-
phy-mode = "rgmii";
87-
88-
allwinner,leds-active-low;
89-
status = "okay";
90-
};
91-
92-
&mdio {
93-
ext_rgmii_phy: ethernet-phy@1 {
94-
compatible = "ethernet-phy-ieee802.3-c22";
95-
reg = <0>;
96-
};
97-
};
98-
9977
&mmc2 {
10078
pinctrl-names = "default";
10179
pinctrl-0 = <&mmc2_8bit_pins>;

‎arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,3 @@
6161
gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
6262
};
6363
};
64-
65-
&emac {
66-
pinctrl-names = "default";
67-
pinctrl-0 = <&emac_rgmii_pins>;
68-
phy-supply = <&reg_gmac_3v3>;
69-
phy-handle = <&ext_rgmii_phy>;
70-
phy-mode = "rgmii";
71-
status = "okay";
72-
};
73-
74-
&mdio {
75-
ext_rgmii_phy: ethernet-phy@1 {
76-
compatible = "ethernet-phy-ieee802.3-c22";
77-
reg = <1>;
78-
};
79-
};

‎arch/arm/boot/dts/sunxi-h3-h5.dtsi

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -391,32 +391,6 @@
391391
clocks = <&osc24M>;
392392
};
393393

394-
emac: ethernet@1c30000 {
395-
compatible = "allwinner,sun8i-h3-emac";
396-
syscon = <&syscon>;
397-
reg = <0x01c30000 0x10000>;
398-
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
399-
interrupt-names = "macirq";
400-
resets = <&ccu RST_BUS_EMAC>;
401-
reset-names = "stmmaceth";
402-
clocks = <&ccu CLK_BUS_EMAC>;
403-
clock-names = "stmmaceth";
404-
#address-cells = <1>;
405-
#size-cells = <0>;
406-
status = "disabled";
407-
408-
mdio: mdio {
409-
#address-cells = <1>;
410-
#size-cells = <0>;
411-
int_mii_phy: ethernet-phy@1 {
412-
compatible = "ethernet-phy-ieee802.3-c22";
413-
reg = <1>;
414-
clocks = <&ccu CLK_BUS_EPHY>;
415-
resets = <&ccu RST_BUS_EPHY>;
416-
};
417-
};
418-
};
419-
420394
spi0: spi@01c68000 {
421395
compatible = "allwinner,sun8i-h3-spi";
422396
reg = <0x01c68000 0x1000>;

0 commit comments

Comments
 (0)