enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
..
..
@@ -78,7 +78,7 @@
78
78
 
79
79
 &can0 {
80
80
 	pinctrl-names = "default";
81
-	pinctrl-0 = <&can0_pins_a>;
81
+	pinctrl-0 = <&can_ph_pins>;
82
82
 	status = "okay";
83
83
 };
84
84
 
..
..
@@ -104,19 +104,11 @@
104
104
 
105
105
 &gmac {
106
106
 	pinctrl-names = "default";
107
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
108
-	phy = <&phy3>;
107
+	pinctrl-0 = <&gmac_rgmii_pins>;
108
+	phy-handle = <&phy3>;
109
109
 	phy-mode = "rgmii";
110
110
 	phy-supply = <&reg_vcc3v3>;
111
-
112
-	snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
113
-	snps,reset-active-low;
114
-	snps,reset-delays-us = <0 10000 1000000>;
115
111
 	status = "okay";
116
-
117
-	phy3: ethernet-phy@3 {
118
-		reg = <3>;
119
-	};
120
112
 };
121
113
 
122
114
 &hdmi {
..
..
@@ -130,8 +122,6 @@
130
122
 };
131
123
 
132
124
 &i2c0 {
133
-	pinctrl-names = "default";
134
-	pinctrl-0 = <&i2c0_pins_a>;
135
125
 	status = "okay";
136
126
 
137
127
 	axp209: pmic@34 {
..
..
@@ -143,8 +133,6 @@
143
133
 
144
134
 /* Exposed to UEXT1 */
145
135
 &i2c1 {
146
-	pinctrl-names = "default";
147
-	pinctrl-0 = <&i2c1_pins_a>;
148
136
 	status = "okay";
149
137
 
150
138
 	eeprom: eeprom@50 {
..
..
@@ -156,20 +144,26 @@
156
144
 
157
145
 /* Exposed to UEXT2 */
158
146
 &i2c2 {
159
-	pinctrl-names = "default";
160
-	pinctrl-0 = <&i2c2_pins_a>;
161
147
 	status = "okay";
162
148
 };
163
149
 
164
150
 &ir0 {
165
151
 	pinctrl-names = "default";
166
-	pinctrl-0 = <&ir0_rx_pins_a>;
152
+	pinctrl-0 = <&ir0_rx_pin>;
167
153
 	status = "okay";
168
154
 };
169
155
 
156
+&gmac_mdio {
157
+	phy3: ethernet-phy@3 {
158
+		reg = <3>;
159
+		reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
160
+		reset-assert-us = <10000>;
161
+		/* wait 1s after reset, otherwise fail to read phy id */
162
+		reset-deassert-us = <1000000>;
163
+	};
164
+};
165
+
170
166
 &mmc0 {
171
-	pinctrl-names = "default";
172
-	pinctrl-0 = <&mmc0_pins_a>;
173
167
 	vmmc-supply = <&reg_vcc3v3>;
174
168
 	bus-width = <4>;
175
169
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
..
..
@@ -177,8 +171,6 @@
177
171
 };
178
172
 
179
173
 &mmc3 {
180
-	pinctrl-names = "default";
181
-	pinctrl-0 = <&mmc3_pins_a>;
182
174
 	vmmc-supply = <&reg_vcc3v3>;
183
175
 	mmc-pwrseq = <&rtl_pwrseq>;
184
176
 	bus-width = <4>;
..
..
@@ -203,8 +195,8 @@
203
195
 };
204
196
 
205
197
 &pio {
206
-	bt_uart_pins: bt_uart_pins@0 {
207
-		pins = "PG6", "PG7", "PG8";
198
+	uart3_rts_pin: uart3-rts-pin {
199
+		pins = "PG8";
208
200
 		function = "uart3";
209
201
 	};
210
202
 };
..
..
@@ -274,43 +266,43 @@
274
266
 /* Exposed to UEXT1 */
275
267
 &spi1 {
276
268
 	pinctrl-names = "default";
277
-	pinctrl-0 = <&spi1_pins_a>,
278
-		    <&spi1_cs0_pins_a>;
269
+	pinctrl-0 = <&spi1_pi_pins>,
270
+		    <&spi1_cs0_pi_pin>;
279
271
 	status = "okay";
280
272
 };
281
273
 
282
274
 /* Exposed to UEXT2 */
283
275
 &spi2 {
284
276
 	pinctrl-names = "default";
285
-	pinctrl-0 = <&spi2_pins_a>,
286
-		    <&spi2_cs0_pins_a>;
277
+	pinctrl-0 = <&spi2_pc_pins>,
278
+		    <&spi2_cs0_pc_pin>;
287
279
 	status = "okay";
288
280
 };
289
281
 
290
282
 &uart0 {
291
283
 	pinctrl-names = "default";
292
-	pinctrl-0 = <&uart0_pins_a>;
284
+	pinctrl-0 = <&uart0_pb_pins>;
293
285
 	status = "okay";
294
286
 };
295
287
 
296
288
 /* Used for RTL8723BS bluetooth */
297
289
 &uart3 {
298
290
 	pinctrl-names = "default";
299
-	pinctrl-0 = <&bt_uart_pins>;
291
+	pinctrl-0 = <&uart3_pg_pins>, <&uart3_rts_pin>;
300
292
 	status = "okay";
301
293
 };
302
294
 
303
295
 /* Exposed to UEXT1 */
304
296
 &uart4 {
305
297
 	pinctrl-names = "default";
306
-	pinctrl-0 = <&uart4_pins_a>;
298
+	pinctrl-0 = <&uart4_pg_pins>;
307
299
 	status = "okay";
308
300
 };
309
301
 
310
302
 /* Exposed to UEXT2 */
311
303
 &uart7 {
312
304
 	pinctrl-names = "default";
313
-	pinctrl-0 = <&uart7_pins_a>;
305
+	pinctrl-0 = <&uart7_pi_pins>;
314
306
 	status = "okay";
315
307
 };
316
308
 
..
..
@@ -324,8 +316,8 @@
324
316
 };
325
317
 
326
318
 &usbphy {
327
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
328
-	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
319
+	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
320
+	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
329
321
 	usb0_vbus_power-supply = <&usb_power_supply>;
330
322
 	usb0_vbus-supply = <&reg_usb0_vbus>;
331
323
 	usb1_vbus-supply = <&reg_usb1_vbus>;