修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
..
..
@@ -74,8 +74,6 @@
74
74
 
75
75
 	leds {
76
76
 		compatible = "gpio-leds";
77
-		pinctrl-names = "default";
78
-		pinctrl-0 = <&led_pins_olimex_som_evb>;
79
77
 
80
78
 		green {
81
79
 			label = "a20-olimex-som-evb:green:usr";
..
..
@@ -112,14 +110,10 @@
112
110
 
113
111
 &gmac {
114
112
 	pinctrl-names = "default";
115
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
116
-	phy = <&phy1>;
113
+	pinctrl-0 = <&gmac_rgmii_pins>;
114
+	phy-handle = <&phy1>;
117
115
 	phy-mode = "rgmii";
118
116
 	status = "okay";
119
-
120
-	phy1: ethernet-phy@1 {
121
-		reg = <1>;
122
-	};
123
117
 };
124
118
 
125
119
 &hdmi {
..
..
@@ -133,8 +127,6 @@
133
127
 };
134
128
 
135
129
 &i2c0 {
136
-	pinctrl-names = "default";
137
-	pinctrl-0 = <&i2c0_pins_a>;
138
130
 	status = "okay";
139
131
 
140
132
 	axp209: pmic@34 {
..
..
@@ -145,14 +137,10 @@
145
137
 };
146
138
 
147
139
 &i2c1 {
148
-	pinctrl-names = "default";
149
-	pinctrl-0 = <&i2c1_pins_a>;
150
140
 	status = "okay";
151
141
 };
152
142
 
153
143
 &i2c2 {
154
-	pinctrl-names = "default";
155
-	pinctrl-0 = <&i2c2_pins_a>;
156
144
 	status = "okay";
157
145
 };
158
146
 
..
..
@@ -160,49 +148,49 @@
160
148
 	vref-supply = <&reg_vcc3v0>;
161
149
 	status = "okay";
162
150
 
163
-	button@190 {
151
+	button-190 {
164
152
 		label = "Volume Up";
165
153
 		linux,code = <KEY_VOLUMEUP>;
166
154
 		channel = <0>;
167
155
 		voltage = <190000>;
168
156
 	};
169
157
 
170
-	button@390 {
158
+	button-390 {
171
159
 		label = "Volume Down";
172
160
 		linux,code = <KEY_VOLUMEDOWN>;
173
161
 		channel = <0>;
174
162
 		voltage = <390000>;
175
163
 	};
176
164
 
177
-	button@600 {
165
+	button-600 {
178
166
 		label = "Menu";
179
167
 		linux,code = <KEY_MENU>;
180
168
 		channel = <0>;
181
169
 		voltage = <600000>;
182
170
 	};
183
171
 
184
-	button@800 {
172
+	button-800 {
185
173
 		label = "Search";
186
174
 		linux,code = <KEY_SEARCH>;
187
175
 		channel = <0>;
188
176
 		voltage = <800000>;
189
177
 	};
190
178
 
191
-	button@980 {
179
+	button-980 {
192
180
 		label = "Home";
193
181
 		linux,code = <KEY_HOMEPAGE>;
194
182
 		channel = <0>;
195
183
 		voltage = <980000>;
196
184
 	};
197
185
 
198
-	button@1180 {
186
+	button-1180 {
199
187
 		label = "Esc";
200
188
 		linux,code = <KEY_ESC>;
201
189
 		channel = <0>;
202
190
 		voltage = <1180000>;
203
191
 	};
204
192
 
205
-	button@1400 {
193
+	button-1400 {
206
194
 		label = "Enter";
207
195
 		linux,code = <KEY_ENTER>;
208
196
 		channel = <0>;
..
..
@@ -210,9 +198,13 @@
210
198
 	};
211
199
 };
212
200
 
201
+&gmac_mdio {
202
+	phy1: ethernet-phy@1 {
203
+		reg = <1>;
204
+	};
205
+};
206
+
213
207
 &mmc0 {
214
-	pinctrl-names = "default";
215
-	pinctrl-0 = <&mmc0_pins_a>;
216
208
 	vmmc-supply = <&reg_vcc3v3>;
217
209
 	bus-width = <4>;
218
210
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -220,8 +212,6 @@
220
212
 };
221
213
 
222
214
 &mmc3 {
223
-	pinctrl-names = "default";
224
-	pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;
225
215
 	vmmc-supply = <&reg_vcc3v3>;
226
216
 	bus-width = <4>;
227
217
 	cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
..
..
@@ -241,36 +231,14 @@
241
231
 };
242
232
 
243
233
 &pio {
244
-	ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 {
245
-		pins = "PC3";
246
-		function = "gpio_out";
247
-	};
248
-
249
-	led_pins_olimex_som_evb: led_pins@0 {
234
+	led_pins_olimex_som_evb: led-pins {
250
235
 		pins = "PH2";
251
236
 		function = "gpio_out";
252
237
 		drive-strength = <20>;
253
238
 	};
254
-
255
-	mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
256
-		pins = "PH0";
257
-		function = "gpio_in";
258
-		bias-pull-up;
259
-	};
260
-
261
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
262
-		pins = "PH4";
263
-		function = "gpio_in";
264
-	};
265
-
266
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
267
-		pins = "PH5";
268
-		function = "gpio_in";
269
-	};
270
239
 };
271
240
 
272
241
 &reg_ahci_5v {
273
-	pinctrl-0 = <&ahci_pwr_pin_olimex_som_evb>;
274
242
 	gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
275
243
 	status = "okay";
276
244
 };
..
..
@@ -316,33 +284,33 @@
316
284
 
317
285
 &spi1 {
318
286
 	pinctrl-names = "default";
319
-	pinctrl-0 = <&spi1_pins_a>,
320
-		    <&spi1_cs0_pins_a>;
287
+	pinctrl-0 = <&spi1_pi_pins>,
288
+		    <&spi1_cs0_pi_pin>;
321
289
 	status = "okay";
322
290
 };
323
291
 
324
292
 &spi2 {
325
293
 	pinctrl-names = "default";
326
-	pinctrl-0 = <&spi2_pins_a>,
327
-		    <&spi2_cs0_pins_a>;
294
+	pinctrl-0 = <&spi2_pc_pins>,
295
+		    <&spi2_cs0_pc_pin>;
328
296
 	status = "okay";
329
297
 };
330
298
 
331
299
 &uart0 {
332
300
 	pinctrl-names = "default";
333
-	pinctrl-0 = <&uart0_pins_a>;
301
+	pinctrl-0 = <&uart0_pb_pins>;
334
302
 	status = "okay";
335
303
 };
336
304
 
337
305
 &uart6 {
338
306
 	pinctrl-names = "default";
339
-	pinctrl-0 = <&uart6_pins_a>;
307
+	pinctrl-0 = <&uart6_pi_pins>;
340
308
 	status = "okay";
341
309
 };
342
310
 
343
311
 &uart7 {
344
312
 	pinctrl-names = "default";
345
-	pinctrl-0 = <&uart7_pins_a>;
313
+	pinctrl-0 = <&uart7_pi_pins>;
346
314
 	status = "okay";
347
315
 };
348
316
 
..
..
@@ -352,8 +320,6 @@
352
320
 };
353
321
 
354
322
 &usbphy {
355
-	pinctrl-names = "default";
356
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
357
323
 	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH04 */
358
324
 	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH05 */
359
325
 	usb0_vbus-supply = <&reg_usb0_vbus>;