修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
..
..
@@ -97,8 +97,8 @@
97
97
 
98
98
 &emac {
99
99
 	pinctrl-names = "default";
100
-	pinctrl-0 = <&emac_pins_b>;
101
-	phy = <&phy1>;
100
+	pinctrl-0 = <&emac_pa_pins>;
101
+	phy-handle = <&phy1>;
102
102
 	status = "okay";
103
103
 };
104
104
 
..
..
@@ -117,8 +117,6 @@
117
117
 };
118
118
 
119
119
 &i2c0 {
120
-	pinctrl-names = "default";
121
-	pinctrl-0 = <&i2c0_pins_a>;
122
120
 	status = "okay";
123
121
 
124
122
 	axp152: pmic@30 {
..
..
@@ -130,11 +128,9 @@
130
128
 #include "axp152.dtsi"
131
129
 
132
130
 &i2c1 {
133
-	pinctrl-names = "default";
134
-	pinctrl-0 = <&i2c1_pins_a>;
135
131
 	status = "okay";
136
132
 
137
-	at24@50 {
133
+	eeprom@50 {
138
134
 		compatible = "atmel,24c16";
139
135
 		pagesize = <16>;
140
136
 		reg = <0x50>;
..
..
@@ -143,8 +139,6 @@
143
139
 };
144
140
 
145
141
 &i2c2 {
146
-	pinctrl-names = "default";
147
-	pinctrl-0 = <&i2c2_pins_a>;
148
142
 	status = "okay";
149
143
 };
150
144
 
..
..
@@ -152,35 +146,35 @@
152
146
 	vref-supply = <&reg_vcc3v0>;
153
147
 	status = "okay";
154
148
 
155
-	button@191 {
149
+	button-191 {
156
150
 		label = "Volume Up";
157
151
 		linux,code = <KEY_VOLUMEUP>;
158
152
 		channel = <0>;
159
153
 		voltage = <191274>;
160
154
 	};
161
155
 
162
-	button@392 {
156
+	button-392 {
163
157
 		label = "Volume Down";
164
158
 		linux,code = <KEY_VOLUMEDOWN>;
165
159
 		channel = <0>;
166
160
 		voltage = <392644>;
167
161
 	};
168
162
 
169
-	button@601 {
163
+	button-601 {
170
164
 		label = "Menu";
171
165
 		linux,code = <KEY_MENU>;
172
166
 		channel = <0>;
173
167
 		voltage = <601151>;
174
168
 	};
175
169
 
176
-	button@795 {
170
+	button-795 {
177
171
 		label = "Enter";
178
172
 		linux,code = <KEY_ENTER>;
179
173
 		channel = <0>;
180
174
 		voltage = <795090>;
181
175
 	};
182
176
 
183
-	button@987 {
177
+	button-987 {
184
178
 		label = "Home";
185
179
 		linux,code = <KEY_HOMEPAGE>;
186
180
 		channel = <0>;
..
..
@@ -197,8 +191,6 @@
197
191
 };
198
192
 
199
193
 &mmc0 {
200
-	pinctrl-names = "default";
201
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
202
194
 	vmmc-supply = <&reg_vcc3v3>;
203
195
 	bus-width = <4>;
204
196
 	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
..
..
@@ -206,8 +198,6 @@
206
198
 };
207
199
 
208
200
 &mmc1 {
209
-	pinctrl-names = "default";
210
-	pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
211
201
 	vmmc-supply = <&reg_vcc3v3>;
212
202
 	bus-width = <4>;
213
203
 	cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
..
..
@@ -223,33 +213,10 @@
223
213
 };
224
214
 
225
215
 &pio {
226
-	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
227
-		pins = "PG1";
228
-		function = "gpio_in";
229
-		bias-pull-up;
230
-	};
231
-
232
-	mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
233
-		pins = "PG13";
234
-		function = "gpio_in";
235
-		bias-pull-up;
236
-	};
237
-
238
-	led_pins_olinuxino: led_pins@0 {
216
+	led_pins_olinuxino: led-pin {
239
217
 		pins = "PE3";
240
218
 		function = "gpio_out";
241
219
 		drive-strength = <20>;
242
-	};
243
-
244
-	usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
245
-		pins = "PB10";
246
-		function = "gpio_out";
247
-	};
248
-
249
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
250
-		pins = "PG12";
251
-		function = "gpio_in";
252
-		bias-pull-up;
253
220
 	};
254
221
 };
255
222
 
..
..
@@ -259,15 +226,14 @@
259
226
 };
260
227
 
261
228
 &reg_usb1_vbus {
262
-	pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
263
229
 	gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
264
230
 	status = "okay";
265
231
 };
266
232
 
267
233
 &spi2 {
268
234
 	pinctrl-names = "default";
269
-	pinctrl-0 = <&spi2_pins_b>,
270
-		    <&spi2_cs0_pins_b>;
235
+	pinctrl-0 = <&spi2_pb_pins>,
236
+		    <&spi2_cs0_pb_pin>;
271
237
 	status = "okay";
272
238
 };
273
239
 
..
..
@@ -277,19 +243,19 @@
277
243
 
278
244
 &uart0 {
279
245
 	pinctrl-names = "default";
280
-	pinctrl-0 = <&uart0_pins_a>;
246
+	pinctrl-0 = <&uart0_pb_pins>;
281
247
 	status = "okay";
282
248
 };
283
249
 
284
250
 &uart2 {
285
251
 	pinctrl-names = "default";
286
-	pinctrl-0 = <&uart2_pins_b>;
252
+	pinctrl-0 = <&uart2_pc_pins>;
287
253
 	status = "okay";
288
254
 };
289
255
 
290
256
 &uart3 {
291
257
 	pinctrl-names = "default";
292
-	pinctrl-0 = <&uart3_pins_a>;
258
+	pinctrl-0 = <&uart3_pg_pins>;
293
259
 	status = "okay";
294
260
 };
295
261
 
..
..
@@ -299,9 +265,7 @@
299
265
 };
300
266
 
301
267
 &usbphy {
302
-	pinctrl-names = "default";
303
-	pinctrl-0 = <&usb0_id_detect_pin>;
304
-	usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
268
+	usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */
305
269
 	usb0_vbus-supply = <&reg_usb0_vbus>;
306
270
 	usb1_vbus-supply = <&reg_usb1_vbus>;
307
271
 	status = "okay";