enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm/boot/dts/sun7i-a20-bananapro.dts
..
..
@@ -62,8 +62,6 @@
62
62
 
63
63
 	leds {
64
64
 		compatible = "gpio-leds";
65
-		pinctrl-names = "default";
66
-		pinctrl-0 = <&led_pins_bananapro>;
67
65
 
68
66
 		blue {
69
67
 			label = "bananapro:blue:usr";
..
..
@@ -78,15 +76,11 @@
78
76
 
79
77
 	wifi_pwrseq: wifi-pwrseq {
80
78
 		compatible = "mmc-pwrseq-simple";
81
-		pinctrl-names = "default";
82
-		pinctrl-0 = <&vmmc3_pin_bananapro>;
83
79
 		reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
84
80
 	};
85
81
 
86
82
 	reg_gmac_3v3: gmac-3v3 {
87
83
 		compatible = "regulator-fixed";
88
-		pinctrl-names = "default";
89
-		pinctrl-0 = <&gmac_power_pin_bananapro>;
90
84
 		regulator-name = "gmac-3v3";
91
85
 		regulator-min-microvolt = <3300000>;
92
86
 		regulator-max-microvolt = <3300000>;
..
..
@@ -114,20 +108,14 @@
114
108
 
115
109
 &gmac {
116
110
 	pinctrl-names = "default";
117
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
118
-	phy = <&phy1>;
119
-	phy-mode = "rgmii";
111
+	pinctrl-0 = <&gmac_rgmii_pins>;
112
+	phy-handle = <&phy1>;
113
+	phy-mode = "rgmii-id";
120
114
 	phy-supply = <&reg_gmac_3v3>;
121
115
 	status = "okay";
122
-
123
-	phy1: ethernet-phy@1 {
124
-		reg = <1>;
125
-	};
126
116
 };
127
117
 
128
118
 &i2c0 {
129
-	pinctrl-names = "default";
130
-	pinctrl-0 = <&i2c0_pins_a>;
131
119
 	status = "okay";
132
120
 
133
121
 	axp209: pmic@34 {
..
..
@@ -142,20 +130,22 @@
142
130
 };
143
131
 
144
132
 &i2c2 {
145
-	pinctrl-names = "default";
146
-	pinctrl-0 = <&i2c2_pins_a>;
147
133
 	status = "okay";
148
134
 };
149
135
 
150
136
 &ir0 {
151
137
 	pinctrl-names = "default";
152
-	pinctrl-0 = <&ir0_rx_pins_a>;
138
+	pinctrl-0 = <&ir0_rx_pin>;
153
139
 	status = "okay";
154
140
 };
155
141
 
142
+&gmac_mdio {
143
+	phy1: ethernet-phy@1 {
144
+		reg = <1>;
145
+	};
146
+};
147
+
156
148
 &mmc0 {
157
-	pinctrl-names = "default";
158
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>;
159
149
 	vmmc-supply = <&reg_vcc3v3>;
160
150
 	bus-width = <4>;
161
151
 	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
..
..
@@ -163,8 +153,6 @@
163
153
 };
164
154
 
165
155
 &mmc3 {
166
-	pinctrl-names = "default";
167
-	pinctrl-0 = <&mmc3_pins_a>;
168
156
 	vmmc-supply = <&reg_vcc3v3>;
169
157
 	mmc-pwrseq = <&wifi_pwrseq>;
170
158
 	bus-width = <4>;
..
..
@@ -188,74 +176,39 @@
188
176
 	status = "okay";
189
177
 };
190
178
 
191
-&pio {
192
-	gmac_power_pin_bananapro: gmac_power_pin@0 {
193
-		pins = "PH23";
194
-		function = "gpio_out";
195
-	};
196
-
197
-	led_pins_bananapro: led_pins@0 {
198
-		pins = "PH24", "PG2";
199
-		function = "gpio_out";
200
-	};
201
-
202
-	mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
203
-		pins = "PH10";
204
-		function = "gpio_in";
205
-		bias-pull-up;
206
-	};
207
-
208
-	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
209
-		pins = "PH0";
210
-		function = "gpio_out";
211
-	};
212
-
213
-	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
214
-		pins = "PH1";
215
-		function = "gpio_out";
216
-	};
217
-
218
-	vmmc3_pin_bananapro: vmmc3_pin@0 {
219
-		pins = "PH22";
220
-		function = "gpio_out";
221
-	};
222
-};
223
-
224
179
 &reg_usb1_vbus {
225
-	pinctrl-0 = <&usb1_vbus_pin_bananapro>;
226
180
 	gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
227
181
 	status = "okay";
228
182
 };
229
183
 
230
184
 &reg_usb2_vbus {
231
-	pinctrl-0 = <&usb2_vbus_pin_bananapro>;
232
185
 	gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
233
186
 	status = "okay";
234
187
 };
235
188
 
236
189
 &spi0 {
237
190
 	pinctrl-names = "default";
238
-	pinctrl-0 = <&spi0_pins_a>,
239
-		    <&spi0_cs0_pins_a>,
240
-		    <&spi0_cs1_pins_a>;
191
+	pinctrl-0 = <&spi0_pi_pins>,
192
+		    <&spi0_cs0_pi_pin>,
193
+		    <&spi0_cs1_pi_pin>;
241
194
 	status = "okay";
242
195
 };
243
196
 
244
197
 &uart0 {
245
198
 	pinctrl-names = "default";
246
-	pinctrl-0 = <&uart0_pins_a>;
199
+	pinctrl-0 = <&uart0_pb_pins>;
247
200
 	status = "okay";
248
201
 };
249
202
 
250
203
 &uart4 {
251
204
 	pinctrl-names = "default";
252
-	pinctrl-0 = <&uart4_pins_b>;
205
+	pinctrl-0 = <&uart4_ph_pins>;
253
206
 	status = "okay";
254
207
 };
255
208
 
256
209
 &uart7 {
257
210
 	pinctrl-names = "default";
258
-	pinctrl-0 = <&uart7_pins_a>;
211
+	pinctrl-0 = <&uart7_pi_pins>;
259
212
 	status = "okay";
260
213
 };
261
214