enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
..
..
@@ -105,14 +105,10 @@
105
105
 
106
106
 &gmac {
107
107
 	pinctrl-names = "default";
108
-	pinctrl-0 = <&gmac_pins_mii_a>;
109
-	phy = <&phy1>;
108
+	pinctrl-0 = <&gmac_mii_pins>;
109
+	phy-handle = <&phy1>;
110
110
 	phy-mode = "mii";
111
111
 	status = "okay";
112
-
113
-	phy1: ethernet-phy@1 {
114
-		reg = <1>;
115
-	};
116
112
 };
117
113
 
118
114
 &hdmi {
..
..
@@ -126,8 +122,6 @@
126
122
 };
127
123
 
128
124
 &i2c0 {
129
-	pinctrl-names = "default";
130
-	pinctrl-0 = <&i2c0_pins_a>;
131
125
 	status = "okay";
132
126
 
133
127
 	axp209: pmic@34 {
..
..
@@ -142,8 +136,6 @@
142
136
 };
143
137
 
144
138
 &i2c1 {
145
-	pinctrl-names = "default";
146
-	pinctrl-0 = <&i2c1_pins_a>;
147
139
 	status = "okay";
148
140
 
149
141
 	eeprom: eeprom@50 {
..
..
@@ -153,9 +145,13 @@
153
145
 	};
154
146
 };
155
147
 
148
+&gmac_mdio {
149
+	phy1: ethernet-phy@1 {
150
+		reg = <1>;
151
+	};
152
+};
153
+
156
154
 &mmc0 {
157
-	pinctrl-names = "default";
158
-	pinctrl-0 = <&mmc0_pins_a>;
159
155
 	vmmc-supply = <&reg_vcc3v3>;
160
156
 	bus-width = <4>;
161
157
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -175,32 +171,14 @@
175
171
 };
176
172
 
177
173
 &pio {
178
-	ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
179
-		pins = "PC3";
180
-		function = "gpio_out";
181
-	};
182
-
183
-	led_pins_olinuxinolime: led_pins@0 {
174
+	led_pins_olinuxinolime: led-pins {
184
175
 		pins = "PH2";
185
176
 		function = "gpio_out";
186
177
 		drive-strength = <20>;
187
178
 	};
188
-
189
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
190
-		pins = "PH4";
191
-		function = "gpio_in";
192
-		bias-pull-up;
193
-	};
194
-
195
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
196
-		pins = "PH5";
197
-		function = "gpio_in";
198
-		bias-pull-down;
199
-	};
200
179
 };
201
180
 
202
181
 &reg_ahci_5v {
203
-	pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
204
182
 	gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
205
183
 	status = "okay";
206
184
 };
..
..
@@ -219,7 +197,7 @@
219
197
 
220
198
 &uart0 {
221
199
 	pinctrl-names = "default";
222
-	pinctrl-0 = <&uart0_pins_a>;
200
+	pinctrl-0 = <&uart0_pb_pins>;
223
201
 	status = "okay";
224
202
 };
225
203
 
..
..
@@ -229,10 +207,8 @@
229
207
 };
230
208
 
231
209
 &usbphy {
232
-	pinctrl-names = "default";
233
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
234
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
235
-	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
210
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
211
+	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
236
212
 	usb0_vbus-supply = <&reg_usb0_vbus>;
237
213
 	usb1_vbus-supply = <&reg_usb1_vbus>;
238
214
 	usb2_vbus-supply = <&reg_usb2_vbus>;