change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/boot/dts/sun8i-r16-parrot.dts
..
..
@@ -63,8 +63,6 @@
63
63
 
64
64
 	leds {
65
65
 		compatible = "gpio-leds";
66
-		pinctrl-names = "default";
67
-		pinctrl-0 = <&led_pins_parrot>;
68
66
 
69
67
 		led1 {
70
68
 			label = "parrot:led1:usr";
..
..
@@ -97,8 +95,6 @@
97
95
 };
98
96
 
99
97
 &i2c1 {
100
-	pinctrl-names = "default";
101
-	pinctrl-0 = <&i2c1_pins_a>;
102
98
 	status = "okay";
103
99
 
104
100
 	/*
..
..
@@ -111,14 +107,14 @@
111
107
 	vref-supply = <&reg_aldo3>;
112
108
 	status = "okay";
113
109
 
114
-	button@0 {
110
+	button-190 {
115
111
 		label = "V+";
116
112
 		linux,code = <KEY_VOLUMEUP>;
117
113
 		channel = <0>;
118
114
 		voltage = <190000>;
119
115
 	};
120
116
 
121
-	button@1 {
117
+	button-390 {
122
118
 		label = "V-";
123
119
 		linux,code = <KEY_VOLUMEDOWN>;
124
120
 		channel = <0>;
..
..
@@ -128,8 +124,6 @@
128
124
 };
129
125
 
130
126
 &mmc0 {
131
-	pinctrl-names = "default";
132
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot>;
133
127
 	vmmc-supply = <&reg_dcdc1>;
134
128
 	cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
135
129
 	bus-width = <4>;
..
..
@@ -138,7 +132,7 @@
138
132
 
139
133
 &mmc1 {
140
134
 	pinctrl-names = "default";
141
-	pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_parrot>;
135
+	pinctrl-0 = <&mmc1_pg_pins>;
142
136
 	vmmc-supply = <&reg_aldo1>;
143
137
 	mmc-pwrseq = <&wifi_pwrseq>;
144
138
 	bus-width = <4>;
..
..
@@ -158,42 +152,10 @@
158
152
 
159
153
 &mmc2_8bit_pins {
160
154
 	drive-strength = <40>;
161
-	bias-pull-up;
162
155
 };
163
156
 
164
157
 &ohci0 {
165
158
 	status = "okay";
166
-};
167
-
168
-&pio {
169
-	mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
170
-		pins = "PD14";
171
-		function = "gpio_in";
172
-		bias-pull-up;
173
-	};
174
-
175
-	led_pins_parrot: led_pins@0 {
176
-		pins = "PE16", "PE17";
177
-		function = "gpio_out";
178
-	};
179
-
180
-	usb0_id_det: usb0_id_detect_pin@0 {
181
-		pins = "PD10";
182
-		function = "gpio_in";
183
-		bias-pull-up;
184
-	};
185
-
186
-	usb1_vbus_pin_parrot: usb1_vbus_pin@0 {
187
-		pins = "PD12";
188
-		function = "gpio_out";
189
-	};
190
-};
191
-
192
-&r_pio {
193
-	wifi_reset_pin_parrot: wifi_reset_pin@0 {
194
-		pins = "PL6";
195
-		function = "gpio_out";
196
-	};
197
159
 };
198
160
 
199
161
 &r_rsb {
..
..
@@ -319,8 +281,6 @@
319
281
 };
320
282
 
321
283
 &reg_usb1_vbus {
322
-	pinctrl-names = "default";
323
-	pinctrl-0 = <&usb1_vbus_pin_parrot>;
324
284
 	gpio = <&pio 3 12 GPIO_ACTIVE_HIGH>; /* PD12 */
325
285
 	status = "okay";
326
286
 };
..
..
@@ -331,7 +291,7 @@
331
291
 
332
292
 &uart0 {
333
293
 	pinctrl-names = "default";
334
-	pinctrl-0 = <&uart0_pins_b>;
294
+	pinctrl-0 = <&uart0_pb_pins>;
335
295
 	status = "okay";
336
296
 };
337
297
 
..
..
@@ -346,10 +306,8 @@
346
306
 
347
307
 &usbphy {
348
308
 	status = "okay";
349
-	pinctrl-names = "default";
350
-	pinctrl-0 = <&usb0_id_det>;
351
309
 	usb0_vbus-supply = <&reg_drivevbus>;
352
-	usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */
310
+	usb0_id_det-gpios = <&pio 3 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD10 */
353
311
 	usb0_vbus_power-supply = <&usb_power_supply>;
354
312
 	usb1_vbus-supply = <&reg_usb1_vbus>;
355
313
 };