enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
..
..
@@ -67,8 +67,6 @@
67
67
 
68
68
 	reg_mmc3_vdd: mmc3_vdd {
69
69
 		compatible = "regulator-fixed";
70
-		pinctrl-names = "default";
71
-		pinctrl-0 = <&mmc3_vdd_pin_a20_hummingbird>;
72
70
 		regulator-name = "mmc3_vdd";
73
71
 		regulator-min-microvolt = <3000000>;
74
72
 		regulator-max-microvolt = <3000000>;
..
..
@@ -78,8 +76,6 @@
78
76
 
79
77
 	reg_gmac_vdd: gmac_vdd {
80
78
 		compatible = "regulator-fixed";
81
-		pinctrl-names = "default";
82
-		pinctrl-0 = <&gmac_vdd_pin_a20_hummingbird>;
83
79
 		regulator-name = "gmac_vdd";
84
80
 		regulator-min-microvolt = <3000000>;
85
81
 		regulator-max-microvolt = <3000000>;
..
..
@@ -103,25 +99,14 @@
103
99
 
104
100
 &gmac {
105
101
 	pinctrl-names = "default";
106
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
107
-	phy = <&phy1>;
102
+	pinctrl-0 = <&gmac_rgmii_pins>;
103
+	phy-handle = <&phy1>;
108
104
 	phy-mode = "rgmii";
109
105
 	phy-supply = <&reg_gmac_vdd>;
110
-	/* phy reset config */
111
-	snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
112
-	snps,reset-active-low;
113
-	/* wait 1s after reset, otherwise fail to read phy id */
114
-	snps,reset-delays-us = <0 10000 1000000>;
115
106
 	status = "okay";
116
-
117
-	phy1: ethernet-phy@1 {
118
-		reg = <1>;
119
-	};
120
107
 };
121
108
 
122
109
 &i2c0 {
123
-	pinctrl-names = "default";
124
-	pinctrl-0 = <&i2c0_pins_a>;
125
110
 	status = "okay";
126
111
 
127
112
 	axp209: pmic@34 {
..
..
@@ -135,32 +120,34 @@
135
120
 };
136
121
 
137
122
 &i2c1 {
138
-	pinctrl-names = "default";
139
-	pinctrl-0 = <&i2c1_pins_a>;
140
123
 	status = "okay";
141
124
 };
142
125
 
143
126
 &i2c2 {
144
-	pinctrl-names = "default";
145
-	pinctrl-0 = <&i2c2_pins_a>;
146
127
 	status = "okay";
147
128
 };
148
129
 
149
130
 &i2c3 {
150
-	pinctrl-names = "default";
151
-	pinctrl-0 = <&i2c3_pins_a>;
152
131
 	status = "okay";
153
132
 };
154
133
 
155
134
 &ir0 {
156
135
 	pinctrl-names = "default";
157
-	pinctrl-0 = <&ir0_rx_pins_a>;
136
+	pinctrl-0 = <&ir0_rx_pin>;
158
137
 	status = "okay";
159
138
 };
160
139
 
140
+&gmac_mdio {
141
+	phy1: ethernet-phy@1 {
142
+		reg = <1>;
143
+		reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
144
+		reset-assert-us = <10000>;
145
+		/* wait 1s after reset, otherwise fail to read phy id */
146
+		reset-deassert-us = <1000000>;
147
+	};
148
+};
149
+
161
150
 &mmc0 {
162
-	pinctrl-names = "default";
163
-	pinctrl-0 = <&mmc0_pins_a>;
164
151
 	vmmc-supply = <&reg_vcc3v0>;
165
152
 	bus-width = <4>;
166
153
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -168,8 +155,6 @@
168
155
 };
169
156
 
170
157
 &mmc3 {
171
-	pinctrl-names = "default";
172
-	pinctrl-0 = <&mmc3_pins_a>;
173
158
 	vmmc-supply = <&reg_mmc3_vdd>;
174
159
 	bus-width = <4>;
175
160
 	non-removable;
..
..
@@ -184,42 +169,18 @@
184
169
 	status = "okay";
185
170
 };
186
171
 
187
-&pio {
188
-	ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 {
189
-		pins = "PH15";
190
-		function = "gpio_out";
191
-	};
192
-
193
-	usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 {
194
-		pins = "PH2";
195
-		function = "gpio_out";
196
-	};
197
-
198
-	mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 {
199
-		pins = "PH9";
200
-		function = "gpio_out";
201
-	};
202
-
203
-	gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 {
204
-		pins = "PH16";
205
-		function = "gpio_out";
206
-	};
207
-};
208
-
209
172
 &pwm {
210
173
 	pinctrl-names = "default";
211
-	pinctrl-0 = <&pwm0_pins_a>;
174
+	pinctrl-0 = <&pwm0_pin>;
212
175
 	status = "okay";
213
176
 };
214
177
 
215
178
 &reg_ahci_5v {
216
-	pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>;
217
179
 	gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
218
180
 	status = "okay";
219
181
 };
220
182
 
221
183
 &reg_usb1_vbus {
222
-	pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>;
223
184
 	gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
224
185
 	status = "okay";
225
186
 };
..
..
@@ -230,38 +191,38 @@
230
191
 
231
192
 &spi2 {
232
193
 	pinctrl-names = "default";
233
-	pinctrl-0 = <&spi2_pins_b>,
234
-		    <&spi2_cs0_pins_b>;
194
+	pinctrl-0 = <&spi2_pb_pins>,
195
+		    <&spi2_cs0_pb_pin>;
235
196
 	status = "okay";
236
197
 };
237
198
 
238
199
 &uart0 {
239
200
 	pinctrl-names = "default";
240
-	pinctrl-0 = <&uart0_pins_a>;
201
+	pinctrl-0 = <&uart0_pb_pins>;
241
202
 	status = "okay";
242
203
 };
243
204
 
244
205
 &uart2 {
245
206
 	pinctrl-names = "default";
246
-	pinctrl-0 = <&uart2_pins_a>;
207
+	pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
247
208
 	status = "okay";
248
209
 };
249
210
 
250
211
 &uart3 {
251
212
 	pinctrl-names = "default";
252
-	pinctrl-0 = <&uart3_pins_a>;
213
+	pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
253
214
 	status = "okay";
254
215
 };
255
216
 
256
217
 &uart4 {
257
218
 	pinctrl-names = "default";
258
-	pinctrl-0 = <&uart4_pins_a>;
219
+	pinctrl-0 = <&uart4_pg_pins>;
259
220
 	status = "okay";
260
221
 };
261
222
 
262
223
 &uart5 {
263
224
 	pinctrl-names = "default";
264
-	pinctrl-0 = <&uart5_pins_a>;
225
+	pinctrl-0 = <&uart5_pi_pins>;
265
226
 	status = "okay";
266
227
 };
267
228