enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
..
..
@@ -73,8 +73,6 @@
73
73
 
74
74
 	leds {
75
75
 		compatible = "gpio-leds";
76
-		pinctrl-names = "default";
77
-		pinctrl-0 = <&led_pins_bpi_m1p>;
78
76
 
79
77
 		green {
80
78
 			label = "bananapi-m1-plus:green:usr";
..
..
@@ -90,15 +88,11 @@
90
88
 
91
89
 	mmc3_pwrseq: mmc3_pwrseq {
92
90
 		compatible = "mmc-pwrseq-simple";
93
-		pinctrl-names = "default";
94
-		pinctrl-0 = <&mmc3_pwrseq_pin_bpi_m1p>;
95
91
 		reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */
96
92
 	};
97
93
 
98
94
 	reg_gmac_3v3: gmac-3v3 {
99
95
 		compatible = "regulator-fixed";
100
-		pinctrl-names = "default";
101
-		pinctrl-0 = <&gmac_power_pin_bpi_m1p>;
102
96
 		regulator-name = "gmac-3v3";
103
97
 		regulator-min-microvolt = <3300000>;
104
98
 		regulator-max-microvolt = <3300000>;
..
..
@@ -134,15 +128,11 @@
134
128
 
135
129
 &gmac {
136
130
 	pinctrl-names = "default";
137
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
138
-	phy = <&phy1>;
139
-	phy-mode = "rgmii";
131
+	pinctrl-0 = <&gmac_rgmii_pins>;
132
+	phy-handle = <&phy1>;
133
+	phy-mode = "rgmii-id";
140
134
 	phy-supply = <&reg_gmac_3v3>;
141
135
 	status = "okay";
142
-
143
-	phy1: ethernet-phy@1 {
144
-		reg = <1>;
145
-	};
146
136
 };
147
137
 
148
138
 &hdmi {
..
..
@@ -156,8 +146,6 @@
156
146
 };
157
147
 
158
148
 &i2c0 {
159
-	pinctrl-names = "default";
160
-	pinctrl-0 = <&i2c0_pins_a>;
161
149
 	status = "okay";
162
150
 
163
151
 	axp209: pmic@34 {
..
..
@@ -175,13 +163,17 @@
175
163
 
176
164
 &ir0 {
177
165
 	pinctrl-names = "default";
178
-	pinctrl-0 = <&ir0_rx_pins_a>;
166
+	pinctrl-0 = <&ir0_rx_pin>;
179
167
 	status = "okay";
180
168
 };
181
169
 
170
+&gmac_mdio {
171
+	phy1: ethernet-phy@1 {
172
+		reg = <1>;
173
+	};
174
+};
175
+
182
176
 &mmc0 {
183
-	pinctrl-names = "default";
184
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>;
185
177
 	vmmc-supply = <&reg_vcc3v3>;
186
178
 	bus-width = <4>;
187
179
 	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
..
..
@@ -191,8 +183,6 @@
191
183
 &mmc3 {
192
184
 	#address-cells = <1>;
193
185
 	#size-cells = <0>;
194
-	pinctrl-names = "default";
195
-	pinctrl-0 = <&mmc3_pins_a>;
196
186
 	vmmc-supply = <&reg_vcc3v3>;
197
187
 	mmc-pwrseq = <&mmc3_pwrseq>;
198
188
 	bus-width = <4>;
..
..
@@ -209,11 +199,6 @@
209
199
 	};
210
200
 };
211
201
 
212
-&mmc3_pins_a {
213
-	/* AP6210 requires pull-up */
214
-	bias-pull-up;
215
-};
216
-
217
202
 &ohci0 {
218
203
 	status = "okay";
219
204
 };
..
..
@@ -224,29 +209,6 @@
224
209
 
225
210
 &otg_sram {
226
211
 	status = "okay";
227
-};
228
-
229
-&pio {
230
-	gmac_power_pin_bpi_m1p: gmac_power_pin@0 {
231
-		pins = "PH23";
232
-		function = "gpio_out";
233
-	};
234
-
235
-	led_pins_bpi_m1p: led_pins@0 {
236
-		pins = "PH24", "PH25";
237
-		function = "gpio_out";
238
-	};
239
-
240
-	mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
241
-		pins = "PH10";
242
-		function = "gpio_in";
243
-		bias-pull-up;
244
-	};
245
-
246
-	mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {
247
-		pins = "PH22";
248
-		function = "gpio_out";
249
-	};
250
212
 };
251
213
 
252
214
 &reg_dcdc2 {
..
..
@@ -280,7 +242,7 @@
280
242
 
281
243
 &uart0 {
282
244
 	pinctrl-names = "default";
283
-	pinctrl-0 = <&uart0_pins_a>;
245
+	pinctrl-0 = <&uart0_pb_pins>;
284
246
 	status = "okay";
285
247
 };
286
248