修改led为gpio

hc

2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d

 kernel/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
..
..
@@ -117,14 +117,10 @@
117
117
 
118
118
 &gmac {
119
119
 	pinctrl-names = "default";
120
-	pinctrl-0 = <&gmac_pins_mii_a>, <&gmac_txerr>;
121
-	phy = <&phy1>;
120
+	pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>;
121
+	phy-handle = <&phy1>;
122
122
 	phy-mode = "mii";
123
123
 	status = "okay";
124
-
125
-	phy1: ethernet-phy@1 {
126
-		reg = <1>;
127
-	};
128
124
 };
129
125
 
130
126
 &hdmi {
..
..
@@ -138,8 +134,6 @@
138
134
 };
139
135
 
140
136
 &i2c0 {
141
-	pinctrl-names = "default";
142
-	pinctrl-0 = <&i2c0_pins_a>;
143
137
 	status = "okay";
144
138
 
145
139
 	axp209: pmic@34 {
..
..
@@ -150,8 +144,6 @@
150
144
 };
151
145
 
152
146
 &i2c1 {
153
-	pinctrl-names = "default";
154
-	pinctrl-0 = <&i2c1_pins_a>;
155
147
 	status = "okay";
156
148
 
157
149
 	eeprom: eeprom@50 {
..
..
@@ -162,8 +154,6 @@
162
154
 };
163
155
 
164
156
 &i2c2 {
165
-	pinctrl-names = "default";
166
-	pinctrl-0 = <&i2c2_pins_a>;
167
157
 	status = "okay";
168
158
 };
169
159
 
..
..
@@ -171,49 +161,49 @@
171
161
 	vref-supply = <&reg_vcc3v0>;
172
162
 	status = "okay";
173
163
 
174
-	button@191 {
164
+	button-191 {
175
165
 		label = "Volume Up";
176
166
 		linux,code = <KEY_VOLUMEUP>;
177
167
 		channel = <0>;
178
168
 		voltage = <191274>;
179
169
 	};
180
170
 
181
-	button@392 {
171
+	button-392 {
182
172
 		label = "Volume Down";
183
173
 		linux,code = <KEY_VOLUMEDOWN>;
184
174
 		channel = <0>;
185
175
 		voltage = <392644>;
186
176
 	};
187
177
 
188
-	button@601 {
178
+	button-601 {
189
179
 		label = "Menu";
190
180
 		linux,code = <KEY_MENU>;
191
181
 		channel = <0>;
192
182
 		voltage = <601151>;
193
183
 	};
194
184
 
195
-	button@795 {
185
+	button-795 {
196
186
 		label = "Search";
197
187
 		linux,code = <KEY_SEARCH>;
198
188
 		channel = <0>;
199
189
 		voltage = <795090>;
200
190
 	};
201
191
 
202
-	button@987 {
192
+	button-987 {
203
193
 		label = "Home";
204
194
 		linux,code = <KEY_HOMEPAGE>;
205
195
 		channel = <0>;
206
196
 		voltage = <987387>;
207
197
 	};
208
198
 
209
-	button@1184 {
199
+	button-1184 {
210
200
 		label = "Esc";
211
201
 		linux,code = <KEY_ESC>;
212
202
 		channel = <0>;
213
203
 		voltage = <1184678>;
214
204
 	};
215
205
 
216
-	button@1398 {
206
+	button-1398 {
217
207
 		label = "Enter";
218
208
 		linux,code = <KEY_ENTER>;
219
209
 		channel = <0>;
..
..
@@ -221,9 +211,13 @@
221
211
 	};
222
212
 };
223
213
 
214
+&gmac_mdio {
215
+	phy1: ethernet-phy@1 {
216
+		reg = <1>;
217
+	};
218
+};
219
+
224
220
 &mmc0 {
225
-	pinctrl-names = "default";
226
-	pinctrl-0 = <&mmc0_pins_a>;
227
221
 	vmmc-supply = <&reg_vcc3v3>;
228
222
 	bus-width = <4>;
229
223
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -231,8 +225,6 @@
231
225
 };
232
226
 
233
227
 &mmc3 {
234
-	pinctrl-names = "default";
235
-	pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
236
228
 	vmmc-supply = <&reg_vcc3v3>;
237
229
 	bus-width = <4>;
238
230
 	cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
..
..
@@ -252,33 +244,15 @@
252
244
 };
253
245
 
254
246
 &pio {
255
-	gmac_txerr: gmac_txerr@0 {
247
+	gmac_txerr: gmac-txerr-pin {
256
248
 		pins = "PA17";
257
249
 		function = "gmac";
258
250
 	};
259
251
 
260
-	mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
261
-		pins = "PH11";
262
-		function = "gpio_in";
263
-		bias-pull-up;
264
-	};
265
-
266
-	led_pins_olinuxino: led_pins@0 {
252
+	led_pins_olinuxino: led-pins {
267
253
 		pins = "PH2";
268
254
 		function = "gpio_out";
269
255
 		drive-strength = <20>;
270
-	};
271
-
272
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
273
-		pins = "PH4";
274
-		function = "gpio_in";
275
-		bias-pull-up;
276
-	};
277
-
278
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
279
-		pins = "PH5";
280
-		function = "gpio_in";
281
-		bias-pull-down;
282
256
 	};
283
257
 };
284
258
 
..
..
@@ -331,33 +305,33 @@
331
305
 
332
306
 &spi1 {
333
307
 	pinctrl-names = "default";
334
-	pinctrl-0 = <&spi1_pins_a>,
335
-		    <&spi1_cs0_pins_a>;
308
+	pinctrl-0 = <&spi1_pi_pins>,
309
+		    <&spi1_cs0_pi_pin>;
336
310
 	status = "okay";
337
311
 };
338
312
 
339
313
 &spi2 {
340
314
 	pinctrl-names = "default";
341
-	pinctrl-0 = <&spi2_pins_a>,
342
-		    <&spi2_cs0_pins_a>;
315
+	pinctrl-0 = <&spi2_pc_pins>,
316
+		    <&spi2_cs0_pc_pin>;
343
317
 	status = "okay";
344
318
 };
345
319
 
346
320
 &uart0 {
347
321
 	pinctrl-names = "default";
348
-	pinctrl-0 = <&uart0_pins_a>;
322
+	pinctrl-0 = <&uart0_pb_pins>;
349
323
 	status = "okay";
350
324
 };
351
325
 
352
326
 &uart6 {
353
327
 	pinctrl-names = "default";
354
-	pinctrl-0 = <&uart6_pins_a>;
328
+	pinctrl-0 = <&uart6_pi_pins>;
355
329
 	status = "okay";
356
330
 };
357
331
 
358
332
 &uart7 {
359
333
 	pinctrl-names = "default";
360
-	pinctrl-0 = <&uart7_pins_a>;
334
+	pinctrl-0 = <&uart7_pi_pins>;
361
335
 	status = "okay";
362
336
 };
363
337
 
..
..
@@ -371,10 +345,8 @@
371
345
 };
372
346
 
373
347
 &usbphy {
374
-	pinctrl-names = "default";
375
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
376
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
377
-	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
348
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
349
+	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
378
350
 	usb0_vbus-supply = <&reg_usb0_vbus>;
379
351
 	usb1_vbus-supply = <&reg_usb1_vbus>;
380
352
 	usb2_vbus-supply = <&reg_usb2_vbus>;