aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts16
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts15
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts17
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts16
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi20
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts17
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts17
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts17
8 files changed, 0 insertions, 135 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index ba2fde2909f9..6872135d7f84 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -51,7 +51,6 @@
51 compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64"; 51 compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";
52 52
53 aliases { 53 aliases {
54 ethernet0 = &emac;
55 serial0 = &uart0; 54 serial0 = &uart0;
56 serial1 = &uart1; 55 serial1 = &uart1;
57 }; 56 };
@@ -68,14 +67,6 @@
68 }; 67 };
69}; 68};
70 69
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
79&i2c1 { 70&i2c1 {
80 pinctrl-names = "default"; 71 pinctrl-names = "default";
81 pinctrl-0 = <&i2c1_pins>; 72 pinctrl-0 = <&i2c1_pins>;
@@ -86,13 +77,6 @@
86 bias-pull-up; 77 bias-pull-up;
87}; 78};
88 79
89&mdio {
90 ext_rgmii_phy: ethernet-phy@1 {
91 compatible = "ethernet-phy-ieee802.3-c22";
92 reg = <1>;
93 };
94};
95
96&mmc0 { 80&mmc0 {
97 pinctrl-names = "default"; 81 pinctrl-names = "default";
98 pinctrl-0 = <&mmc0_pins>; 82 pinctrl-0 = <&mmc0_pins>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
index 24f1aac366d6..f82ccf332c0f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
@@ -48,18 +48,3 @@
48 48
49 /* TODO: Camera, touchscreen, etc. */ 49 /* TODO: Camera, touchscreen, etc. */
50}; 50};
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};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 827168bc22ed..7c533b6d4ba9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -51,7 +51,6 @@
51 compatible = "pine64,pine64", "allwinner,sun50i-a64"; 51 compatible = "pine64,pine64", "allwinner,sun50i-a64";
52 52
53 aliases { 53 aliases {
54 ethernet0 = &emac;
55 serial0 = &uart0; 54 serial0 = &uart0;
56 serial1 = &uart1; 55 serial1 = &uart1;
57 serial2 = &uart2; 56 serial2 = &uart2;
@@ -79,15 +78,6 @@
79 status = "okay"; 78 status = "okay";
80}; 79};
81 80
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
91&i2c1 { 81&i2c1 {
92 pinctrl-names = "default"; 82 pinctrl-names = "default";
93 pinctrl-0 = <&i2c1_pins>; 83 pinctrl-0 = <&i2c1_pins>;
@@ -98,13 +88,6 @@
98 bias-pull-up; 88 bias-pull-up;
99}; 89};
100 90
101&mdio {
102 ext_rmii_phy1: ethernet-phy@1 {
103 compatible = "ethernet-phy-ieee802.3-c22";
104 reg = <1>;
105 };
106};
107
108&mmc0 { 91&mmc0 {
109 pinctrl-names = "default"; 92 pinctrl-names = "default";
110 pinctrl-0 = <&mmc0_pins>; 93 pinctrl-0 = <&mmc0_pins>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 216e3a5dafae..d891a1a27f6c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -53,7 +53,6 @@
53 "allwinner,sun50i-a64"; 53 "allwinner,sun50i-a64";
54 54
55 aliases { 55 aliases {
56 ethernet0 = &emac;
57 serial0 = &uart0; 56 serial0 = &uart0;
58 }; 57 };
59 58
@@ -77,21 +76,6 @@
77 status = "okay"; 76 status = "okay";
78}; 77};
79 78
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
95&mmc2 { 79&mmc2 {
96 pinctrl-names = "default"; 80 pinctrl-names = "default";
97 pinctrl-0 = <&mmc2_pins>; 81 pinctrl-0 = <&mmc2_pins>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index bd0f33b77f57..68aadc9b96dc 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -449,26 +449,6 @@
449 #size-cells = <0>; 449 #size-cells = <0>;
450 }; 450 };
451 451
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
472 gic: interrupt-controller@1c81000 { 452 gic: interrupt-controller@1c81000 {
473 compatible = "arm,gic-400"; 453 compatible = "arm,gic-400";
474 reg = <0x01c81000 0x1000>, 454 reg = <0x01c81000 0x1000>,
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
index 968908761194..1c2387bd5df6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
@@ -50,7 +50,6 @@
50 compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5"; 50 compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";
51 51
52 aliases { 52 aliases {
53 ethernet0 = &emac;
54 serial0 = &uart0; 53 serial0 = &uart0;
55 }; 54 };
56 55
@@ -109,22 +108,6 @@
109 status = "okay"; 108 status = "okay";
110}; 109};
111 110
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
128&mmc0 { 111&mmc0 {
129 pinctrl-names = "default"; 112 pinctrl-names = "default";
130 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; 113 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
index a8296feee884..4f77c8470f6c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
@@ -59,7 +59,6 @@
59 }; 59 };
60 60
61 aliases { 61 aliases {
62 ethernet0 = &emac;
63 serial0 = &uart0; 62 serial0 = &uart0;
64 }; 63 };
65 64
@@ -137,28 +136,12 @@
137 status = "okay"; 136 status = "okay";
138}; 137};
139 138
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
149&ir { 139&ir {
150 pinctrl-names = "default"; 140 pinctrl-names = "default";
151 pinctrl-0 = <&ir_pins_a>; 141 pinctrl-0 = <&ir_pins_a>;
152 status = "okay"; 142 status = "okay";
153}; 143};
154 144
155&mdio {
156 ext_rgmii_phy: ethernet-phy@1 {
157 compatible = "ethernet-phy-ieee802.3-c22";
158 reg = <1>;
159 };
160};
161
162&mmc0 { 145&mmc0 {
163 pinctrl-names = "default"; 146 pinctrl-names = "default";
164 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; 147 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
index d906b302cbcd..6be06873e5af 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
@@ -54,7 +54,6 @@
54 compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5"; 54 compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5";
55 55
56 aliases { 56 aliases {
57 ethernet0 = &emac;
58 serial0 = &uart0; 57 serial0 = &uart0;
59 }; 58 };
60 59
@@ -144,28 +143,12 @@
144 status = "okay"; 143 status = "okay";
145}; 144};
146 145
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
156&ir { 146&ir {
157 pinctrl-names = "default"; 147 pinctrl-names = "default";
158 pinctrl-0 = <&ir_pins_a>; 148 pinctrl-0 = <&ir_pins_a>;
159 status = "okay"; 149 status = "okay";
160}; 150};
161 151
162&mdio {
163 ext_rgmii_phy: ethernet-phy@1 {
164 compatible = "ethernet-phy-ieee802.3-c22";
165 reg = <1>;
166 };
167};
168
169&mmc0 { 152&mmc0 {
170 pinctrl-names = "default"; 153 pinctrl-names = "default";
171 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; 154 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;