修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
..
..
@@ -86,31 +86,23 @@
86
86
 	vga-dac {
87
87
 		compatible = "dumb-vga-dac";
88
88
 		vdd-supply = <&reg_vga_3v3>;
89
-		#address-cells = <1>;
90
-		#size-cells = <0>;
91
89
 
92
90
 		ports {
93
91
 			#address-cells = <1>;
94
92
 			#size-cells = <0>;
95
93
 
96
94
 			port@0 {
97
-				#address-cells = <1>;
98
-				#size-cells = <0>;
99
95
 				reg = <0>;
100
96
 
101
-				vga_dac_in: endpoint@0 {
102
-					reg = <0>;
97
+				vga_dac_in: endpoint {
103
98
 					remote-endpoint = <&tcon0_out_vga>;
104
99
 				};
105
100
 			};
106
101
 
107
102
 			port@1 {
108
-				#address-cells = <1>;
109
-				#size-cells = <0>;
110
103
 				reg = <1>;
111
104
 
112
-				vga_dac_out: endpoint@0 {
113
-					reg = <0>;
105
+				vga_dac_out: endpoint {
114
106
 					remote-endpoint = <&vga_con_in>;
115
107
 				};
116
108
 			};
..
..
@@ -160,17 +152,10 @@
160
152
 
161
153
 &gmac {
162
154
 	pinctrl-names = "default";
163
-	pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>;
164
-	phy = <&phy1>;
165
-	phy-mode = "rgmii";
166
-	snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
167
-	snps,reset-active-low;
168
-	snps,reset-delays-us = <0 10000 30000>;
155
+	pinctrl-0 = <&gmac_rgmii_pins>;
156
+	phy-handle = <&phy1>;
157
+	phy-mode = "rgmii-id";
169
158
 	status = "okay";
170
-
171
-	phy1: ethernet-phy@1 {
172
-		reg = <1>;
173
-	};
174
159
 };
175
160
 
176
161
 &hdmi {
..
..
@@ -184,21 +169,15 @@
184
169
 };
185
170
 
186
171
 &i2c0 {
187
-	pinctrl-names = "default";
188
-	pinctrl-0 = <&i2c0_pins_a>;
189
172
 	/* pull-ups and devices require AXP221 DLDO3 */
190
173
 	status = "failed";
191
174
 };
192
175
 
193
176
 &i2c1 {
194
-	pinctrl-names = "default";
195
-	pinctrl-0 = <&i2c1_pins_a>;
196
177
 	status = "okay";
197
178
 };
198
179
 
199
180
 &i2c2 {
200
-	pinctrl-names = "default";
201
-	pinctrl-0 = <&i2c2_pins_a>;
202
181
 	status = "okay";
203
182
 
204
183
 	pcf8563: rtc@51 {
..
..
@@ -209,27 +188,27 @@
209
188
 
210
189
 &ir {
211
190
 	pinctrl-names = "default";
212
-	pinctrl-0 = <&ir_pins_a>;
191
+	pinctrl-0 = <&s_ir_rx_pin>;
213
192
 	status = "okay";
214
193
 };
215
194
 
195
+&mdio {
196
+	phy1: ethernet-phy@1 {
197
+		reg = <1>;
198
+		reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>;
199
+		reset-assert-us = <10000>;
200
+		reset-deassert-us = <30000>;
201
+	};
202
+};
203
+
216
204
 &mmc0 {
217
-	pinctrl-names = "default";
218
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
219
205
 	vmmc-supply = <&reg_dcdc1>;
220
206
 	bus-width = <4>;
221
207
 	cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
222
208
 	status = "okay";
223
209
 };
224
210
 
225
-&mmc0_pins_a {
226
-	/* external pull-ups missing for some pins */
227
-	bias-pull-up;
228
-};
229
-
230
211
 &mmc1 {
231
-	pinctrl-names = "default";
232
-	pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>;
233
212
 	vmmc-supply = <&reg_aldo1>;
234
213
 	mmc-pwrseq = <&wifi_pwrseq>;
235
214
 	bus-width = <4>;
..
..
@@ -239,24 +218,6 @@
239
218
 
240
219
 &ohci0 {
241
220
 	status = "okay";
242
-};
243
-
244
-&pio {
245
-	gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
246
-		pins = "PA21";
247
-		function = "gpio_out";
248
-	};
249
-
250
-	mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
251
-		pins = "PA8";
252
-		function = "gpio_in";
253
-		bias-pull-up;
254
-	};
255
-
256
-	wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
257
-		pins = "PG10";
258
-		function = "gpio_out";
259
-	};
260
221
 };
261
222
 
262
223
 &p2wi {
..
..
@@ -354,7 +315,7 @@
354
315
 
355
316
 &uart0 {
356
317
 	pinctrl-names = "default";
357
-	pinctrl-0 = <&uart0_pins_a>;
318
+	pinctrl-0 = <&uart0_ph_pins>;
358
319
 	status = "okay";
359
320
 };
360
321
 
..
..
@@ -368,8 +329,8 @@
368
329
 };
369
330
 
370
331
 &usbphy {
371
-	usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
372
-	usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */
332
+	usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
333
+	usb0_vbus_det-gpios = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */
373
334
 	usb0_vbus_power-supply = <&usb_power_supply>;
374
335
 	usb0_vbus-supply = <&reg_drivevbus>;
375
336
 	usb1_vbus-supply = <&reg_usb1_vbus>;