kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
..
..
@@ -74,8 +74,6 @@
74
74
 
75
75
 	bridge {
76
76
 		compatible = "dumb-vga-dac";
77
-		#address-cells = <1>;
78
-		#size-cells = <0>;
79
77
 
80
78
 		ports {
81
79
 			#address-cells = <1>;
..
..
@@ -123,8 +121,6 @@
123
121
 };
124
122
 
125
123
 &i2c0 {
126
-	pinctrl-names = "default";
127
-	pinctrl-0 = <&i2c0_pins_a>;
128
124
 	status = "okay";
129
125
 
130
126
 	axp209: pmic@34 {
..
..
@@ -138,14 +134,10 @@
138
134
 };
139
135
 
140
136
 &i2c1 {
141
-	pinctrl-names = "default";
142
-	pinctrl-0 = <&i2c1_pins_a>;
143
137
 	status = "okay";
144
138
 };
145
139
 
146
140
 &i2c2 {
147
-	pinctrl-names = "default";
148
-	pinctrl-0 = <&i2c2_pins_a>;
149
141
 	status = "okay";
150
142
 };
151
143
 
..
..
@@ -153,35 +145,35 @@
153
145
 	vref-supply = <&reg_vcc3v0>;
154
146
 	status = "okay";
155
147
 
156
-	button@191 {
148
+	button-191 {
157
149
 		label = "Volume Up";
158
150
 		linux,code = <KEY_VOLUMEUP>;
159
151
 		channel = <0>;
160
152
 		voltage = <191274>;
161
153
 	};
162
154
 
163
-	button@392 {
155
+	button-392 {
164
156
 		label = "Volume Down";
165
157
 		linux,code = <KEY_VOLUMEDOWN>;
166
158
 		channel = <0>;
167
159
 		voltage = <392644>;
168
160
 	};
169
161
 
170
-	button@601 {
162
+	button-601 {
171
163
 		label = "Menu";
172
164
 		linux,code = <KEY_MENU>;
173
165
 		channel = <0>;
174
166
 		voltage = <601151>;
175
167
 	};
176
168
 
177
-	button@795 {
169
+	button-795 {
178
170
 		label = "Enter";
179
171
 		linux,code = <KEY_ENTER>;
180
172
 		channel = <0>;
181
173
 		voltage = <795090>;
182
174
 	};
183
175
 
184
-	button@987 {
176
+	button-987 {
185
177
 		label = "Home";
186
178
 		linux,code = <KEY_HOMEPAGE>;
187
179
 		channel = <0>;
..
..
@@ -190,8 +182,6 @@
190
182
 };
191
183
 
192
184
 &mmc0 {
193
-	pinctrl-names = "default";
194
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
195
185
 	vmmc-supply = <&reg_vcc3v3>;
196
186
 	bus-width = <4>;
197
187
 	cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
..
..
@@ -207,33 +197,10 @@
207
197
 };
208
198
 
209
199
 &pio {
210
-	mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
211
-		pins = "PG0";
212
-		function = "gpio_in";
213
-		bias-pull-up;
214
-	};
215
-
216
-	led_pins_olinuxino: led_pins@0 {
200
+	led_pins_olinuxino: led-pin {
217
201
 		pins = "PG9";
218
202
 		function = "gpio_out";
219
203
 		drive-strength = <20>;
220
-	};
221
-
222
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
223
-		pins = "PG2";
224
-		function = "gpio_in";
225
-		bias-pull-up;
226
-	};
227
-
228
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
229
-		pins = "PG1";
230
-		function = "gpio_in";
231
-		bias-pull-down;
232
-	};
233
-
234
-	usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
235
-		pins = "PG11";
236
-		function = "gpio_out";
237
204
 	};
238
205
 };
239
206
 
..
..
@@ -243,7 +210,6 @@
243
210
 };
244
211
 
245
212
 &reg_usb1_vbus {
246
-	pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
247
213
 	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
248
214
 	status = "okay";
249
215
 };
..
..
@@ -263,7 +229,7 @@
263
229
 
264
230
 &uart1 {
265
231
 	pinctrl-names = "default";
266
-	pinctrl-0 = <&uart1_pins_b>;
232
+	pinctrl-0 = <&uart1_pg_pins>;
267
233
 	status = "okay";
268
234
 };
269
235
 
..
..
@@ -273,10 +239,8 @@
273
239
 };
274
240
 
275
241
 &usbphy {
276
-	pinctrl-names = "default";
277
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
278
-	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
279
-	usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
242
+	usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
243
+	usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
280
244
 	usb0_vbus-supply = <&reg_usb0_vbus>;
281
245
 	usb1_vbus-supply = <&reg_usb1_vbus>;
282
246
 	status = "okay";