update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts
..
..
@@ -7,7 +7,9 @@
7
7
 /dts-v1/;
8
8
 
9
9
 #include "rk3588-vehicle-evb-v21.dtsi"
10
+#include "rk3588-vehicle-evb-v22-nca9539-io-expander.dtsi"
10
11
 #include "rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi"
12
+#include "rk3588-vehicle-evb-maxim-max96756-dphy0.dtsi"
11
13
 #include "rk3588-vehicle-serdes-mfd-display-rohm.dtsi"
12
14
 #include "rk3588-android.dtsi"
13
15
 
..
..
@@ -27,6 +29,8 @@
27
29
 		vin-supply = <&vcc12v_dcin>;
28
30
 		pinctrl-names = "default";
29
31
 		pinctrl-0 = <&vcc5v0_buck_en>;
32
+		startup-delay-us = <2500>;
33
+		off-on-delay-us = <1500>;
30
34
 		regulator-state-mem {
31
35
 			regulator-on-in-suspend;
32
36
 			regulator-suspend-microvolt = <5000000>;
..
..
@@ -59,7 +63,7 @@
59
63
 		regulator-min-microvolt = <12000000>;
60
64
 		regulator-max-microvolt = <12000000>;
61
65
 		enable-active-high;
62
-		gpio = <&i2c5_nca9539_gpio 0 GPIO_ACTIVE_HIGH>;
66
+		gpio = <&nca9539_gpio 0 GPIO_ACTIVE_HIGH>;
63
67
 		vin-supply = <&vcc12v_dcin>;
64
68
 		regulator-state-mem {
65
69
 			regulator-off-in-suspend;
..
..
@@ -75,7 +79,7 @@
75
79
 		regulator-min-microvolt = <12000000>;
76
80
 		regulator-max-microvolt = <12000000>;
77
81
 		enable-active-high;
78
-		gpio = <&i2c5_nca9539_gpio 1 GPIO_ACTIVE_HIGH>;
82
+		gpio = <&nca9539_gpio 1 GPIO_ACTIVE_HIGH>;
79
83
 		vin-supply = <&vcc12v_dcin>;
80
84
 		regulator-state-mem {
81
85
 			regulator-off-in-suspend;
..
..
@@ -91,7 +95,7 @@
91
95
 		regulator-min-microvolt = <12000000>;
92
96
 		regulator-max-microvolt = <12000000>;
93
97
 		enable-active-high;
94
-		gpio = <&i2c5_nca9539_gpio 2 GPIO_ACTIVE_HIGH>;
98
+		gpio = <&nca9539_gpio 2 GPIO_ACTIVE_HIGH>;
95
99
 		vin-supply = <&vcc12v_dcin>;
96
100
 		regulator-state-mem {
97
101
 			regulator-off-in-suspend;
..
..
@@ -107,7 +111,7 @@
107
111
 		regulator-min-microvolt = <12000000>;
108
112
 		regulator-max-microvolt = <12000000>;
109
113
 		enable-active-high;
110
-		gpio = <&i2c5_nca9539_gpio 3 GPIO_ACTIVE_HIGH>;
114
+		gpio = <&nca9539_gpio 3 GPIO_ACTIVE_HIGH>;
111
115
 		vin-supply = <&vcc12v_dcin>;
112
116
 		regulator-state-mem {
113
117
 			regulator-off-in-suspend;
..
..
@@ -123,7 +127,7 @@
123
127
 		regulator-min-microvolt = <12000000>;
124
128
 		regulator-max-microvolt = <12000000>;
125
129
 		enable-active-high;
126
-		gpio = <&i2c5_nca9539_gpio 4 GPIO_ACTIVE_HIGH>;
130
+		gpio = <&nca9539_gpio 4 GPIO_ACTIVE_HIGH>;
127
131
 		vin-supply = <&vcc12v_dcin>;
128
132
 		regulator-state-mem {
129
133
 			regulator-off-in-suspend;
..
..
@@ -139,7 +143,7 @@
139
143
 		regulator-min-microvolt = <12000000>;
140
144
 		regulator-max-microvolt = <12000000>;
141
145
 		enable-active-high;
142
-		gpio = <&i2c5_nca9539_gpio 5 GPIO_ACTIVE_HIGH>;
146
+		gpio = <&nca9539_gpio 5 GPIO_ACTIVE_HIGH>;
143
147
 		vin-supply = <&vcc12v_dcin>;
144
148
 		regulator-state-mem {
145
149
 			regulator-off-in-suspend;
..
..
@@ -147,15 +151,16 @@
147
151
 		};
148
152
 	};
149
153
 
150
-	camera1_vcc12v_buck: camera1_vcc12v-buck {
154
+	dcphy0_vcc12v_buck: dcphy0_vcc12v-buck {
151
155
 		compatible = "regulator-fixed";
152
-		regulator-name = "camera1_vcc12v_buck";
156
+		regulator-name = "dcphy0_vcc12v_buck";
153
157
 		regulator-boot-on;
154
-		regulator-always-on;
155
158
 		regulator-min-microvolt = <12000000>;
156
159
 		regulator-max-microvolt = <12000000>;
157
160
 		enable-active-high;
158
-		gpio = <&i2c5_nca9539_gpio 6 GPIO_ACTIVE_HIGH>;
161
+		gpio = <&nca9539_gpio 6 GPIO_ACTIVE_HIGH>;
162
+		startup-delay-us = <2000>;
163
+		off-on-delay-us = <16000>;
159
164
 		vin-supply = <&vcc12v_dcin>;
160
165
 		regulator-state-mem {
161
166
 			regulator-off-in-suspend;
..
..
@@ -163,15 +168,16 @@
163
168
 		};
164
169
 	};
165
170
 
166
-	camera2_vcc12v_buck: camera2_vcc12v-buck {
171
+	dcphy1_vcc12v_buck: dcphy1_vcc12v-buck {
167
172
 		compatible = "regulator-fixed";
168
-		regulator-name = "camera2_vcc12v_buck";
173
+		regulator-name = "dcphy1_vcc12v_buck";
169
174
 		regulator-boot-on;
170
-		regulator-always-on;
171
175
 		regulator-min-microvolt = <12000000>;
172
176
 		regulator-max-microvolt = <12000000>;
173
177
 		enable-active-high;
174
-		gpio = <&i2c5_nca9539_gpio 7 GPIO_ACTIVE_HIGH>;
178
+		gpio = <&nca9539_gpio 7 GPIO_ACTIVE_HIGH>;
179
+		startup-delay-us = <2000>;
180
+		off-on-delay-us = <16000>;
175
181
 		vin-supply = <&vcc12v_dcin>;
176
182
 		regulator-state-mem {
177
183
 			regulator-off-in-suspend;
..
..
@@ -179,15 +185,16 @@
179
185
 		};
180
186
 	};
181
187
 
182
-	camera3_vcc12v_buck: camera3_vcc12v-buck {
188
+	dphy0_vcc12v_buck: dphy0_vcc12v-buck {
183
189
 		compatible = "regulator-fixed";
184
-		regulator-name = "camera3_vcc12v_buck";
190
+		regulator-name = "dphy0_vcc12v_buck";
185
191
 		regulator-boot-on;
186
-		regulator-always-on;
187
192
 		regulator-min-microvolt = <12000000>;
188
193
 		regulator-max-microvolt = <12000000>;
189
194
 		enable-active-high;
190
-		gpio = <&i2c5_nca9539_gpio 8 GPIO_ACTIVE_HIGH>;
195
+		gpio = <&nca9539_gpio 8 GPIO_ACTIVE_HIGH>;
196
+		startup-delay-us = <2000>;
197
+		off-on-delay-us = <16000>;
191
198
 		vin-supply = <&vcc12v_dcin>;
192
199
 		regulator-state-mem {
193
200
 			regulator-off-in-suspend;
..
..
@@ -195,15 +202,16 @@
195
202
 		};
196
203
 	};
197
204
 
198
-	camera4_vcc12v_buck: camera4_vcc12v-buck {
205
+	dphy3_vcc12v_buck: dphy3_vcc12v-buck {
199
206
 		compatible = "regulator-fixed";
200
-		regulator-name = "camera4_vcc12v_buck";
207
+		regulator-name = "dphy3_vcc12v_buck";
201
208
 		regulator-boot-on;
202
-		regulator-always-on;
203
209
 		regulator-min-microvolt = <12000000>;
204
210
 		regulator-max-microvolt = <12000000>;
205
211
 		enable-active-high;
206
-		gpio = <&i2c5_nca9539_gpio 9 GPIO_ACTIVE_HIGH>;
212
+		gpio = <&nca9539_gpio 9 GPIO_ACTIVE_HIGH>;
213
+		startup-delay-us = <2000>;
214
+		off-on-delay-us = <16000>;
207
215
 		vin-supply = <&vcc12v_dcin>;
208
216
 		regulator-state-mem {
209
217
 			regulator-off-in-suspend;
..
..
@@ -219,7 +227,9 @@
219
227
 		regulator-min-microvolt = <5000000>;
220
228
 		regulator-max-microvolt = <5000000>;
221
229
 		enable-active-high;
222
-		gpio = <&i2c5_nca9539_gpio 10 GPIO_ACTIVE_HIGH>;
230
+		gpio = <&nca9539_gpio 10 GPIO_ACTIVE_HIGH>;
231
+		startup-delay-us = <2000>;
232
+		off-on-delay-us = <16000>;
223
233
 		vin-supply = <&vcc5v0_usb>;
224
234
 	};
225
235
 
..
..
@@ -231,7 +241,9 @@
231
241
 		regulator-min-microvolt = <5000000>;
232
242
 		regulator-max-microvolt = <5000000>;
233
243
 		enable-active-high;
234
-		gpio = <&i2c5_nca9539_gpio 11 GPIO_ACTIVE_HIGH>;
244
+		gpio = <&nca9539_gpio 11 GPIO_ACTIVE_HIGH>;
245
+		startup-delay-us = <2000>;
246
+		off-on-delay-us = <16000>;
235
247
 		vin-supply = <&vcc5v0_usb>;
236
248
 	};
237
249
 
..
..
@@ -243,7 +255,7 @@
243
255
 		regulator-min-microvolt = <12000000>;
244
256
 		regulator-max-microvolt = <12000000>;
245
257
 		enable-active-high;
246
-		gpio = <&i2c5_nca9539_gpio 12 GPIO_ACTIVE_HIGH>;
258
+		gpio = <&nca9539_gpio 12 GPIO_ACTIVE_HIGH>;
247
259
 		vin-supply = <&vcc12v_dcin>;
248
260
 		regulator-state-mem {
249
261
 			regulator-off-in-suspend;
..
..
@@ -255,22 +267,22 @@
255
267
 		compatible = "regulator-fixed";
256
268
 		regulator-name = "minipcie_power_buck";
257
269
 		regulator-boot-on;
258
-		regulator-always-on;
259
-		regulator-min-microvolt = <12000000>;
260
-		regulator-max-microvolt = <12000000>;
270
+		//regulator-always-on;
271
+		regulator-min-microvolt = <3300000>;
272
+		regulator-max-microvolt = <3300000>;
261
273
 		enable-active-high;
262
-		gpio = <&i2c5_nca9539_gpio 13 GPIO_ACTIVE_HIGH>;
263
-		vin-supply = <&vcc5v0_usb>;
274
+		gpio = <&nca9539_gpio 13 GPIO_ACTIVE_HIGH>;
275
+		vin-supply = <&vcc5v0_buck>;
264
276
 		regulator-state-mem {
265
-			regulator-off-in-suspend;
266
-			regulator-suspend-microvolt = <12000000>;
277
+			regulator-on-in-suspend;
278
+			regulator-suspend-microvolt = <3300000>;
267
279
 		};
268
280
 	};
269
281
 
270
282
 	bt-sound {
271
283
 		compatible = "simple-audio-card";
272
284
 		simple-audio-card,format = "dsp_a";
273
-		simple-audio-card,bitclock-inversion = <1>;
285
+		simple-audio-card,bitclock-inversion;
274
286
 		simple-audio-card,mclk-fs = <256>;
275
287
 		simple-audio-card,name = "rockchip,bt";
276
288
 		simple-audio-card,cpu {
..
..
@@ -329,6 +341,18 @@
329
341
 	};
330
342
 };
331
343
 
344
+&max96712_dphy3_vcc1v2 {
345
+	vin-supply = <&vcc5v0_buck>;
346
+};
347
+
348
+&max96712_dphy3_poc {
349
+	vin-supply = <&dphy3_vcc12v_buck>;
350
+};
351
+
352
+&max96756_dphy0_vcc1v2 {
353
+	vin-supply = <&vcc5v0_buck>;
354
+};
355
+
332
356
 &avdd1v8_ddr_pll_s0 {
333
357
 	regulator-state-mem {
334
358
 		regulator-on-in-suspend;
..
..
@@ -351,12 +375,12 @@
351
375
 };
352
376
 
353
377
 &i2c2_bu18tl82 {
354
-	//route-enable;
355
-	use-delay-work;
378
+	route-enable;
379
+	//use-delay-work;
356
380
 };
357
381
 
358
382
 &i2c2_bu18rl82 {
359
-	use-delay-work;
383
+	//use-delay-work;
360
384
 	vpower-supply = <&lcd1_vcc12v_buck>;
361
385
 };
362
386
 
..
..
@@ -367,11 +391,11 @@
367
391
 };
368
392
 
369
393
 &i2c4_bu18tl82 {
370
-	use-delay-work;
394
+	//use-delay-work;
371
395
 };
372
396
 
373
397
 &i2c4_bu18rl82 {
374
-	use-delay-work;
398
+	//use-delay-work;
375
399
 	vpower-supply = <&lcd5_vcc12v_buck>;
376
400
 };
377
401
 
..
..
@@ -380,44 +404,14 @@
380
404
 		interrupt-parent = <&gpio1>;
381
405
 		interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>;
382
406
 	};
383
-
384
-	i2c5_nca9539: i2c5-nca9539@74 {
385
-		compatible = "novo,nca9539";
386
-		reg = <0x74>;
387
-		status = "okay";
388
-
389
-		/* P00-P07 P10-P17 output HIGH level default*/
390
-		serdes-init-sequence = [
391
-			0002 00ff
392
-			0003 00ff
393
-			0004 0000
394
-			0005 0000
395
-			0006 0000
396
-			0007 0000
397
-		];
398
-
399
-		i2c5_nca9539_pinctrl: i2c5-nca9539-pinctrl {
400
-			compatible = "novo,nca9539-pinctrl";
401
-			status = "okay";
402
-
403
-			i2c5_nca9539_gpio: i2c5-nca9539-gpio {
404
-				compatible = "novo,nca9539-gpio";
405
-				status = "okay";
406
-
407
-				gpio-controller;
408
-				#gpio-cells = <2>;
409
-				gpio-ranges = <&i2c5_nca9539_pinctrl 0 256 16>;
410
-			};
411
-		};
412
-	};
413
407
 };
414
408
 
415
409
 &i2c5_bu18tl82 {
416
-	use-delay-work;
410
+	//use-delay-work;
417
411
 };
418
412
 
419
413
 &i2c5_bu18rl82 {
420
-	use-delay-work;
414
+	//use-delay-work;
421
415
 	vpower-supply = <&lcd3_vcc12v_buck>;
422
416
 };
423
417
 
..
..
@@ -428,8 +422,8 @@
428
422
 };
429
423
 
430
424
 &i2c6_bu18tl82 {
431
-	//route-enable;
432
-	use-delay-work;
425
+	route-enable;
426
+	//use-delay-work;
433
427
 };
434
428
 
435
429
 &i2c6_bu18rl82 {
..
..
@@ -438,6 +432,10 @@
438
432
 };
439
433
 
440
434
 &pinctrl {
435
+	pinctrl-names = "init";
436
+	pinctrl-0 = <&max96712_dphy3_pwdn
437
+			&max96712_dphy3_errb
438
+			&max96712_dphy3_lock>;
441
439
 
442
440
 	bl {
443
441
 		bl0_enable_pin: bl0-enable-pin {
..
..
@@ -471,15 +469,15 @@
471
469
 
472
470
 	max96712-dphy3 {
473
471
 		max96712_dphy3_pwdn: max96712-dphy3-pwdn {
474
-			rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
472
+			rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_output_low>;
475
473
 		};
476
474
 
477
475
 		max96712_dphy3_errb: max96712-dphy3-errb {
478
-			rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
476
+			rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none_smt>;
479
477
 		};
480
478
 
481
479
 		max96712_dphy3_lock: max96712-dphy3-lock {
482
-			rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
480
+			rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none_smt>;
483
481
 		};
484
482
 	};
485
483
 
..
..
@@ -543,11 +541,11 @@
543
541
 };
544
542
 
545
543
 &route_dsi0 {
546
-	status = "disabled";
544
+	status = "okay";
547
545
 };
548
546
 
549
547
 &route_dsi1 {
550
-	status = "disabled";
548
+	status = "okay";
551
549
 };
552
550
 
553
551
 &u2phy1_otg {