enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -141,6 +141,27 @@
141
141
 		default-brightness-level = <200>;
142
142
 	};
143
143
 
144
+	bt_sco: bt-sco {
145
+		status = "disabled";
146
+		compatible = "delta,dfbmcs320";
147
+		#sound-dai-cells = <1>;
148
+	};
149
+
150
+	bt_sound: bt-sound {
151
+		status = "disabled";
152
+		compatible = "simple-audio-card";
153
+		simple-audio-card,format = "dsp_a";
154
+		simple-audio-card,bitclock-inversion = <0>;
155
+		simple-audio-card,mclk-fs = <256>;
156
+		simple-audio-card,name = "rockchip,bt";
157
+		simple-audio-card,cpu {
158
+			sound-dai = <&i2s3_2ch>;
159
+		};
160
+		simple-audio-card,codec {
161
+			sound-dai = <&bt_sco 1>;
162
+		};
163
+	};
164
+
144
165
 	dc_12v: dc-12v {
145
166
 		compatible = "regulator-fixed";
146
167
 		regulator-name = "dc_12v";
..
..
@@ -151,12 +172,18 @@
151
172
 	};
152
173
 
153
174
 	hdmi_sound: hdmi-sound {
175
+		compatible = "simple-audio-card";
176
+		simple-audio-card,format = "i2s";
177
+		simple-audio-card,mclk-fs = <128>;
178
+		simple-audio-card,name = "rockchip,hdmi";
154
179
 		status = "disabled";
155
-		compatible = "rockchip,hdmi";
156
-		rockchip,mclk-fs = <128>;
157
-		rockchip,card-name = "rockchip,hdmi";
158
-		rockchip,cpu = <&i2s0_8ch>;
159
-		rockchip,codec = <&hdmi>;
180
+
181
+		simple-audio-card,cpu {
182
+				sound-dai = <&i2s0_8ch>;
183
+		};
184
+		simple-audio-card,codec {
185
+				sound-dai = <&hdmi>;
186
+		};
160
187
 	};
161
188
 
162
189
 	leds: leds {
..
..
@@ -187,23 +214,22 @@
187
214
 
188
215
 	rk809_sound: rk809-sound {
189
216
 		status = "okay";
190
-		compatible = "simple-audio-card";
191
-		simple-audio-card,format = "i2s";
192
-		simple-audio-card,name = "rockchip,rk809-codec";
193
-		simple-audio-card,mclk-fs = <256>;
194
-
195
-		simple-audio-card,cpu {
196
-			sound-dai = <&i2s1_8ch>;
197
-		};
198
-		simple-audio-card,codec {
199
-			sound-dai = <&rk809_codec>;
200
-		};
217
+		compatible = "rockchip,multicodecs-card";
218
+		rockchip,card-name = "rockchip-rk809";
219
+		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
220
+		rockchip,format = "i2s";
221
+		rockchip,mclk-fs = <256>;
222
+		rockchip,cpu = <&i2s1_8ch>;
223
+		rockchip,codec = <&rk809_codec>;
224
+		pinctrl-names = "default";
225
+		pinctrl-0 = <&hp_det>;
201
226
 	};
202
227
 
203
228
 	spdif-sound {
204
229
 		status = "okay";
205
230
 		compatible = "simple-audio-card";
206
231
 		simple-audio-card,name = "ROCKCHIP,SPDIF";
232
+		simple-audio-card,mclk-fs = <128>;
207
233
 		simple-audio-card,cpu {
208
234
 				sound-dai = <&spdif_8ch>;
209
235
 		};
..
..
@@ -364,30 +390,6 @@
364
390
 	status = "okay";
365
391
 };
366
392
 
367
-&can0 {
368
-	assigned-clocks = <&cru CLK_CAN0>;
369
-	assigned-clock-rates = <150000000>;
370
-	pinctrl-names = "default";
371
-	pinctrl-0 = <&can0m1_pins>;
372
-	status = "disabled";
373
-};
374
-
375
-&can1 {
376
-	assigned-clocks = <&cru CLK_CAN1>;
377
-	assigned-clock-rates = <150000000>;
378
-	pinctrl-names = "default";
379
-	pinctrl-0 = <&can1m1_pins>;
380
-	status = "disabled";
381
-};
382
-
383
-&can2 {
384
-	assigned-clocks = <&cru CLK_CAN2>;
385
-	assigned-clock-rates = <150000000>;
386
-	pinctrl-names = "default";
387
-	pinctrl-0 = <&can2m1_pins>;
388
-	status = "disabled";
389
-};
390
-
391
393
 &cpu0 {
392
394
 	cpu-supply = <&vdd_cpu>;
393
395
 };
..
..
@@ -419,267 +421,198 @@
419
421
 		dsi,format = <MIPI_DSI_FMT_RGB888>;
420
422
 		dsi,lanes  = <4>;
421
423
 		panel-init-sequence = [
422
-			23 00 02 FE 21
423
-			23 00 02 04 00
424
-			23 00 02 00 64
425
-			23 00 02 2A 00
426
-			23 00 02 26 64
427
-			23 00 02 54 00
428
-			23 00 02 50 64
429
-			23 00 02 7B 00
430
-			23 00 02 77 64
431
-			23 00 02 A2 00
432
-			23 00 02 9D 64
433
-			23 00 02 C9 00
434
-			23 00 02 C5 64
435
-			23 00 02 01 71
436
-			23 00 02 27 71
437
-			23 00 02 51 71
438
-			23 00 02 78 71
439
-			23 00 02 9E 71
440
-			23 00 02 C6 71
441
-			23 00 02 02 89
442
-			23 00 02 28 89
443
-			23 00 02 52 89
444
-			23 00 02 79 89
445
-			23 00 02 9F 89
446
-			23 00 02 C7 89
447
-			23 00 02 03 9E
448
-			23 00 02 29 9E
449
-			23 00 02 53 9E
450
-			23 00 02 7A 9E
451
-			23 00 02 A0 9E
452
-			23 00 02 C8 9E
453
-			23 00 02 09 00
454
-			23 00 02 05 B0
455
-			23 00 02 31 00
456
-			23 00 02 2B B0
457
-			23 00 02 5A 00
458
-			23 00 02 55 B0
459
-			23 00 02 80 00
460
-			23 00 02 7C B0
461
-			23 00 02 A7 00
462
-			23 00 02 A3 B0
463
-			23 00 02 CE 00
464
-			23 00 02 CA B0
465
-			23 00 02 06 C0
466
-			23 00 02 2D C0
467
-			23 00 02 56 C0
468
-			23 00 02 7D C0
469
-			23 00 02 A4 C0
470
-			23 00 02 CB C0
471
-			23 00 02 07 CF
472
-			23 00 02 2F CF
473
-			23 00 02 58 CF
474
-			23 00 02 7E CF
475
-			23 00 02 A5 CF
476
-			23 00 02 CC CF
477
-			23 00 02 08 DD
478
-			23 00 02 30 DD
479
-			23 00 02 59 DD
480
-			23 00 02 7F DD
481
-			23 00 02 A6 DD
482
-			23 00 02 CD DD
483
-			23 00 02 0E 15
484
-			23 00 02 0A E9
485
-			23 00 02 36 15
486
-			23 00 02 32 E9
487
-			23 00 02 5F 15
488
-			23 00 02 5B E9
489
-			23 00 02 85 15
490
-			23 00 02 81 E9
491
-			23 00 02 AD 15
492
-			23 00 02 A9 E9
493
-			23 00 02 D3 15
494
-			23 00 02 CF E9
495
-			23 00 02 0B 14
496
-			23 00 02 33 14
497
-			23 00 02 5C 14
498
-			23 00 02 82 14
499
-			23 00 02 AA 14
500
-			23 00 02 D0 14
501
-			23 00 02 0C 36
502
-			23 00 02 34 36
503
-			23 00 02 5D 36
504
-			23 00 02 83 36
505
-			23 00 02 AB 36
506
-			23 00 02 D1 36
507
-			23 00 02 0D 6B
508
-			23 00 02 35 6B
509
-			23 00 02 5E 6B
510
-			23 00 02 84 6B
511
-			23 00 02 AC 6B
512
-			23 00 02 D2 6B
513
-			23 00 02 13 5A
514
-			23 00 02 0F 94
515
-			23 00 02 3B 5A
516
-			23 00 02 37 94
517
-			23 00 02 64 5A
518
-			23 00 02 60 94
519
-			23 00 02 8A 5A
520
-			23 00 02 86 94
521
-			23 00 02 B2 5A
522
-			23 00 02 AE 94
523
-			23 00 02 D8 5A
524
-			23 00 02 D4 94
525
-			23 00 02 10 D1
526
-			23 00 02 38 D1
527
-			23 00 02 61 D1
528
-			23 00 02 87 D1
529
-			23 00 02 AF D1
530
-			23 00 02 D5 D1
531
-			23 00 02 11 04
532
-			23 00 02 39 04
533
-			23 00 02 62 04
534
-			23 00 02 88 04
535
-			23 00 02 B0 04
536
-			23 00 02 D6 04
537
-			23 00 02 12 05
538
-			23 00 02 3A 05
539
-			23 00 02 63 05
540
-			23 00 02 89 05
541
-			23 00 02 B1 05
542
-			23 00 02 D7 05
543
-			23 00 02 18 AA
544
-			23 00 02 14 36
545
-			23 00 02 42 AA
546
-			23 00 02 3D 36
547
-			23 00 02 69 AA
548
-			23 00 02 65 36
549
-			23 00 02 8F AA
550
-			23 00 02 8B 36
551
-			23 00 02 B7 AA
552
-			23 00 02 B3 36
553
-			23 00 02 DD AA
554
-			23 00 02 D9 36
555
-			23 00 02 15 74
556
-			23 00 02 3F 74
557
-			23 00 02 66 74
558
-			23 00 02 8C 74
559
-			23 00 02 B4 74
560
-			23 00 02 DA 74
561
-			23 00 02 16 9F
562
-			23 00 02 40 9F
563
-			23 00 02 67 9F
564
-			23 00 02 8D 9F
565
-			23 00 02 B5 9F
566
-			23 00 02 DB 9F
567
-			23 00 02 17 DC
568
-			23 00 02 41 DC
569
-			23 00 02 68 DC
570
-			23 00 02 8E DC
571
-			23 00 02 B6 DC
572
-			23 00 02 DC DC
573
-			23 00 02 1D FF
574
-			23 00 02 19 03
575
-			23 00 02 47 FF
576
-			23 00 02 43 03
577
-			23 00 02 6E FF
578
-			23 00 02 6A 03
579
-			23 00 02 94 FF
580
-			23 00 02 90 03
581
-			23 00 02 BC FF
582
-			23 00 02 B8 03
583
-			23 00 02 E2 FF
584
-			23 00 02 DE 03
585
-			23 00 02 1A 35
586
-			23 00 02 44 35
587
-			23 00 02 6B 35
588
-			23 00 02 91 35
589
-			23 00 02 B9 35
590
-			23 00 02 DF 35
591
-			23 00 02 1B 45
592
-			23 00 02 45 45
593
-			23 00 02 6C 45
594
-			23 00 02 92 45
595
-			23 00 02 BA 45
596
-			23 00 02 E0 45
597
-			23 00 02 1C 55
598
-			23 00 02 46 55
599
-			23 00 02 6D 55
600
-			23 00 02 93 55
601
-			23 00 02 BB 55
602
-			23 00 02 E1 55
603
-			23 00 02 22 FF
604
-			23 00 02 1E 68
605
-			23 00 02 4C FF
606
-			23 00 02 48 68
607
-			23 00 02 73 FF
608
-			23 00 02 6F 68
609
-			23 00 02 99 FF
610
-			23 00 02 95 68
611
-			23 00 02 C1 FF
612
-			23 00 02 BD 68
613
-			23 00 02 E7 FF
614
-			23 00 02 E3 68
615
-			23 00 02 1F 7E
616
-			23 00 02 49 7E
617
-			23 00 02 70 7E
618
-			23 00 02 96 7E
619
-			23 00 02 BE 7E
620
-			23 00 02 E4 7E
621
-			23 00 02 20 97
622
-			23 00 02 4A 97
623
-			23 00 02 71 97
624
-			23 00 02 97 97
625
-			23 00 02 BF 97
626
-			23 00 02 E5 97
627
-			23 00 02 21 B5
628
-			23 00 02 4B B5
629
-			23 00 02 72 B5
630
-			23 00 02 98 B5
631
-			23 00 02 C0 B5
632
-			23 00 02 E6 B5
633
-			23 00 02 25 F0
634
-			23 00 02 23 E8
635
-			23 00 02 4F F0
636
-			23 00 02 4D E8
637
-			23 00 02 76 F0
638
-			23 00 02 74 E8
639
-			23 00 02 9C F0
640
-			23 00 02 9A E8
641
-			23 00 02 C4 F0
642
-			23 00 02 C2 E8
643
-			23 00 02 EA F0
644
-			23 00 02 E8 E8
645
-			23 00 02 24 FF
646
-			23 00 02 4E FF
647
-			23 00 02 75 FF
648
-			23 00 02 9B FF
649
-			23 00 02 C3 FF
650
-			23 00 02 E9 FF
651
-			23 00 02 FE 3D
652
-			23 00 02 00 04
653
-			23 00 02 FE 23
654
-			23 00 02 08 82
655
-			23 00 02 0A 00
656
-			23 00 02 0B 00
657
-			23 00 02 0C 01
658
-			23 00 02 16 00
659
-			23 00 02 18 02
660
-			23 00 02 1B 04
661
-			23 00 02 19 04
662
-			23 00 02 1C 81
663
-			23 00 02 1F 00
664
-			23 00 02 20 03
665
-			23 00 02 23 04
666
-			23 00 02 21 01
667
-			23 00 02 54 63
668
-			23 00 02 55 54
669
-			23 00 02 6E 45
670
-			23 00 02 6D 36
671
-			23 00 02 FE 3D
672
-			23 00 02 55 78
673
-			23 00 02 FE 20
674
-			23 00 02 26 30
675
-			23 00 02 FE 3D
676
-			23 00 02 20 71
677
-			23 00 02 50 8F
678
-			23 00 02 51 8F
679
-			23 00 02 FE 00
680
-			23 00 02 35 00
681
-			05 78 01 11
682
-			05 1E 01 29
424
+			39 00 05 FF 03 98 81 03
425
+			39 00 03 01 01 00
426
+			39 00 03 02 01 00
427
+			39 00 03 03 01 53     
428
+			39 00 03 04 01 D3     
429
+			39 00 03 05 01 00     
430
+			39 00 03 06 01 0D     
431
+			39 00 03 07 01 08     
432
+			39 00 03 08 01 00     
433
+			39 00 03 09 01 00     
434
+			39 00 03 0a 01 00     
435
+			39 00 03 0b 01 00     
436
+			39 00 03 0c 01 00     
437
+			39 00 03 0d 01 00     
438
+			39 00 03 0e 01 00     
439
+			39 00 03 0f 01 28     
440
+			39 00 03 10 01 28     
441
+			39 00 03 11 01 00     
442
+			39 00 03 12 01 00     
443
+			39 00 03 13 01 00     
444
+			39 00 03 14 01 00     
445
+			39 00 03 15 01 00     
446
+			39 00 03 16 01 00     
447
+			39 00 03 17 01 00     
448
+			39 00 03 18 01 00     
449
+			39 00 03 19 01 00     
450
+			39 00 03 1a 01 00     
451
+			39 00 03 1b 01 00     
452
+			39 00 03 1c 01 00     
453
+			39 00 03 1d 01 00     
454
+			39 00 03 1e 01 40     
455
+			39 00 03 1f 01 80     
456
+			39 00 03 20 01 06     
457
+			39 00 03 21 01 01     
458
+			39 00 03 22 01 00     
459
+			39 00 03 23 01 00     
460
+			39 00 03 24 01 00     
461
+			39 00 03 25 01 00     
462
+			39 00 03 26 01 00     
463
+			39 00 03 27 01 00     
464
+			39 00 03 28 01 33     
465
+			39 00 03 29 01 33     
466
+			39 00 03 2a 01 00     
467
+			39 00 03 2b 01 00     
468
+			39 00 03 2c 01 00     
469
+			39 00 03 2d 01 00     
470
+			39 00 03 2e 01 00     
471
+			39 00 03 2f 01 00     
472
+			39 00 03 30 01 00     
473
+			39 00 03 31 01 00     
474
+			39 00 03 32 01 00     
475
+			39 00 03 33 01 00     
476
+			39 00 03 34 01 03     
477
+			39 00 03 35 01 00     
478
+			39 00 03 36 01 00     
479
+			39 00 03 37 01 00     
480
+			39 00 03 38 01 96     
481
+			39 00 03 39 01 00
482
+			39 00 03 3a 01 00 
483
+			39 00 03 3b 01 00
484
+			39 00 03 3c 01 00
485
+			39 00 03 3d 01 00
486
+			39 00 03 3e 01 00
487
+			39 00 03 3f 01 00
488
+			39 00 03 40 01 00
489
+			39 00 03 41 01 00
490
+			39 00 03 42 01 00
491
+			39 00 03 43 01 00  
492
+			39 00 03 44 01 00	 
493
+			39 00 03 50 01 00
494
+			39 00 03 51 01 23
495
+			39 00 03 52 01 45
496
+			39 00 03 53 01 67
497
+			39 00 03 54 01 89
498
+			39 00 03 55 01 AB
499
+			39 00 03 56 01 01
500
+			39 00 03 57 01 23
501
+			39 00 03 58 01 45
502
+			39 00 03 59 01 67
503
+			39 00 03 5a 01 89
504
+			39 00 03 5b 01 AB
505
+			39 00 03 5c 01 CD
506
+			39 00 03 5d 01 EF
507
+			39 00 03 5e 01 00
508
+			39 00 03 5f 01 08     
509
+			39 00 03 60 01 08     
510
+			39 00 03 61 01 06     
511
+			39 00 03 62 01 06     
512
+			39 00 03 63 01 01     
513
+			39 00 03 64 01 01     
514
+			39 00 03 65 01 00     
515
+			39 00 03 66 01 00     
516
+			39 00 03 67 01 02     
517
+			39 00 03 68 01 15     
518
+			39 00 03 69 01 15     
519
+			39 00 03 6a 01 14     
520
+			39 00 03 6b 01 14     
521
+			39 00 03 6c 01 0D     
522
+			39 00 03 6d 01 0D     
523
+			39 00 03 6e 01 0C      
524
+			39 00 03 6f 01 0C     
525
+			39 00 03 70 01 0F     
526
+			39 00 03 71 01 0F     
527
+			39 00 03 72 01 0E     
528
+			39 00 03 73 01 0E     
529
+			39 00 03 74 01 02     
530
+			39 00 03 75 01 08     
531
+			39 00 03 76 01 08     
532
+			39 00 03 77 01 06     
533
+			39 00 03 78 01 06     
534
+			39 00 03 79 01 01     
535
+			39 00 03 7a 01 01     
536
+			39 00 03 7b 01 00     
537
+			39 00 03 7c 01 00     
538
+			39 00 03 7d 01 02     
539
+			39 00 03 7e 01 15     
540
+			39 00 03 7f 01 15     
541
+			39 00 03 80 01 14     
542
+			39 00 03 81 01 14     
543
+			39 00 03 82 01 0D     
544
+			39 00 03 83 01 0D     
545
+			39 00 03 84 01 0C     
546
+			39 00 03 85 01 0C     
547
+			39 00 03 86 01 0F     
548
+			39 00 03 87 01 0F     
549
+			39 00 03 88 01 0E     
550
+			39 00 03 89 01 0E     
551
+			39 00 03 8A 01 02     
552
+			39 00 05 FF 03 98 81 04
553
+			39 00 03 C5 01 3A      
554
+			39 00 03 6E 01 2B      
555
+			39 00 03 6F 01 37      
556
+			39 00 03 3A 01 24      
557
+			39 00 03 8D 01 1A      
558
+			39 00 03 87 01 BA      
559
+			39 00 03 B2 01 D1
560
+			39 00 03 88 01 0B
561
+			39 00 03 38 01 01      
562
+			39 00 03 39 01 00
563
+			39 00 03 B5 01 02      
564
+			39 00 03 31 01 25      
565
+			39 00 03 3B 01 98  		
566
+			39 00 05 FF 03 98 81 01
567
+			39 00 03 22 01 0A      
568
+			39 00 03 31 01 00      
569
+			39 00 03 53 01 3D      
570
+			39 00 03 55 01 3D      
571
+			39 00 03 50 01 85      
572
+			39 00 03 51 01 80      
573
+			39 00 03 60 01 06      
574
+			39 00 03 62 01 20
575
+			39 00 03 A0 01 00
576
+			39 00 03 A1 01 21
577
+			39 00 03 A2 01 35
578
+			39 00 03 A3 01 19
579
+			39 00 03 A4 01 1E
580
+			39 00 03 A5 01 33
581
+			39 00 03 A6 01 27
582
+			39 00 03 A7 01 26
583
+			39 00 03 A8 01 AF
584
+			39 00 03 A9 01 1B
585
+			39 00 03 AA 01 27
586
+			39 00 03 AB 01 8D
587
+			39 00 03 AC 01 1A
588
+			39 00 03 AD 01 1B
589
+			39 00 03 AE 01 50
590
+			39 00 03 AF 01 26
591
+			39 00 03 B0 01 2B
592
+			39 00 03 B1 01 54
593
+			39 00 03 B2 01 5E
594
+			39 00 03 B3 01 23
595
+			39 00 03 C0 01 00
596
+			39 00 03 C1 01 21
597
+			39 00 03 C2 01 35
598
+			39 00 03 C3 01 19
599
+			39 00 03 C4 01 1E
600
+			39 00 03 C5 01 33
601
+			39 00 03 C6 01 27
602
+			39 00 03 C7 01 26
603
+			39 00 03 C8 01 AF
604
+			39 00 03 C9 01 1B
605
+			39 00 03 CA 01 27
606
+			39 00 03 CB 01 8D
607
+			39 00 03 CC 01 1A
608
+			39 00 03 CD 01 1B
609
+			39 00 03 CE 01 50
610
+			39 00 03 CF 01 26
611
+			39 00 03 D0 01 2B
612
+			39 00 03 D1 01 54
613
+			39 00 03 D2 01 5E
614
+			39 00 03 D3 01 23		
615
+			39 00 05 FF 03 98 81 00
683
616
 		];
684
617
 
685
618
 		panel-exit-sequence = [
..
..
@@ -757,226 +690,206 @@
757
690
         dsi,lanes  = <4>;
758
691
 
759
692
         panel-init-sequence = [
760
-                15 00 02 E0 00
761
-                15 00 02 E1 93
762
-                15 00 02 E2 65
763
-                15 00 02 E3 F8
764
-                15 00 02 E0 01
765
-                15 00 02 00 01
766
-                15 00 02 01 36
767
-                15 00 02 03 01
768
-                15 00 02 04 36
769
-                15 00 02 12 A0
770
-                15 00 02 17 00
771
-                15 00 02 18 EF
772
-                15 00 02 19 00
773
-                15 00 02 1A 00
774
-                15 00 02 1B EF
775
-                15 00 02 1C 00
776
-                15 00 02 1F 6A
777
-                15 00 02 20 28
778
-                15 00 02 21 28
779
-                15 00 02 22 7E
780
-                15 00 02 26 DF
781
-                15 00 02 37 59
782
-                15 00 02 38 05
783
-			    15 00 02 39 02
784
-                15 00 02 3A 05
785
-                15 00 02 3C 78
786
-                15 00 02 3D FF
787
-                15 00 02 3E FF
788
-                15 00 02 3F FF
789
-                15 00 02 40 06
790
-                15 00 02 41 A0
791
-                15 00 02 43 14
792
-                15 00 02 44 0E
793
-                15 00 02 45 28
794
-                15 00 02 55 0F
795
-                15 00 02 56 01
796
-                15 00 02 57 69
797
-                15 00 02 58 0A
798
-                15 00 02 59 0A
799
-                15 00 02 5A 2B
800
-                15 00 02 5B 14
801
-                15 00 02 5D 7E
802
-                15 00 02 5E 50
803
-                15 00 02 5F 37
804
-                15 00 02 60 21
805
-                15 00 02 61 19
806
-                15 00 02 62 0B
807
-                15 00 02 63 0E
808
-                15 00 02 64 00
809
-                15 00 02 65 1A
810
-		        15 00 02 66 1B
811
-                15 00 02 67 1F
812
-                15 00 02 68 3D
813
-                15 00 02 69 31
814
-                15 00 02 6A 40
815
-                15 00 02 6B 33
816
-                15 00 02 6C 34
817
-                15 00 02 6D 26
818
-                15 00 02 6E 1B
819
-                15 00 02 6F 0F
820
-                15 00 02 70 74
821
-                15 00 02 71 59
822
-                15 00 02 72 43
823
-                15 00 02 73 36
824
-                15 00 02 74 30
825
-                15 00 02 75 1A
826
-                15 00 02 76 21
827
-                15 00 02 77 08
828
-                15 00 02 78 29
829
-                15 00 02 79 2E
830
-                15 00 02 7A 31
831
-                15 00 02 7B 54
832
-                15 00 02 7C 41
833
-                15 00 02 7D 4A
834
-                15 00 02 7E 44
835
-                15 00 02 7F 41
836
-                15 00 02 80 34
837
-                15 00 02 81 26
838
-                15 00 02 82 0F
839
-                15 00 02 E0 02
840
-                15 00 02 00 49
841
-                15 00 02 01 48
842
-                15 00 02 02 47
843
-                15 00 02 03 46
844
-                15 00 02 04 45
845
-                15 00 02 05 44
846
-                15 00 02 06 4A
847
-                15 00 02 07 4B
848
-                15 00 02 08 50
849
-                15 00 02 09 1F
850
-                15 00 02 0A 1F
851
-                15 00 02 0B 1F
852
-                15 00 02 0C 1F
853
-                15 00 02 0D 1F
854
-                15 00 02 0E 1F
855
-                15 00 02 0F 51
856
-                15 00 02 10 52
857
-		        15 00 02 11 53
858
-                15 00 02 12 40
859
-                15 00 02 13 41
860
-                15 00 02 14 42
861
-                15 00 02 15 43
862
-                15 00 02 16 49
863
-                15 00 02 17 48
864
-                15 00 02 18 47
865
-                15 00 02 19 46
866
-                15 00 02 1A 45
867
-                15 00 02 1B 44
868
-                15 00 02 1C 4A
869
-                15 00 02 1D 4B
870
-                15 00 02 1E 50
871
-                15 00 02 1F 1F
872
-                15 00 02 20 1F
873
-                15 00 02 21 1F
874
-                15 00 02 22 1F
875
-                15 00 02 23 1F
876
-                15 00 02 24 1F
877
-                15 00 02 25 51
878
-                15 00 02 26 52
879
-                15 00 02 27 53
880
-                15 00 02 28 40
881
-                15 00 02 29 41
882
-                15 00 02 2A 42
883
-                15 00 02 2B 43
884
-                15 00 02 2C 0A
885
-                15 00 02 2D 0B
886
-                15 00 02 2E 04
887
-                15 00 02 2F 05
888
-                15 00 02 30 06
889
-                15 00 02 31 07
890
-                15 00 02 32 09
891
-                15 00 02 33 08
892
-                15 00 02 34 03
893
-                15 00 02 35 1F
894
-                15 00 02 36 1F
895
-                15 00 02 37 1F
896
-                15 00 02 38 1F
897
-                15 00 02 39 1F
898
-                15 00 02 3A 1F
899
-                15 00 02 3B 02
900
-                15 00 02 3C 01
901
-                15 00 02 3D 00
902
-                15 00 02 3E 13
903
-                15 00 02 3F 12
904
-                15 00 02 40 11
905
-		        15 00 02 41 10
906
-                15 00 02 42 0A
907
-                15 00 02 43 0B
908
-                15 00 02 44 04
909
-                15 00 02 45 05
910
-                15 00 02 46 06
911
-                15 00 02 47 07
912
-                15 00 02 48 09
913
-                15 00 02 49 08
914
-                15 00 02 4A 03
915
-                15 00 02 4B 1F
916
-                15 00 02 4C 1F
917
-                15 00 02 4D 1F
918
-                15 00 02 4E 1F
919
-                15 00 02 4F 1F
920
-                15 00 02 50 1F
921
-                15 00 02 51 02
922
-                15 00 02 52 01
923
-                15 00 02 53 00
924
-                15 00 02 54 13
925
-                15 00 02 55 12
926
-                15 00 02 56 11
927
-                15 00 02 57 10
928
-                15 00 02 58 40
929
-                15 00 02 59 00
930
-                15 00 02 5A 00
931
-                15 00 02 5B 30
932
-                15 00 02 5C 07
933
-                15 00 02 5D 40
934
-                15 00 02 5E 01
935
-                15 00 02 5F 02
936
-                15 00 02 60 40
937
-                15 00 02 61 01
938
-                15 00 02 62 02
939
-                15 00 02 63 70
940
-                15 00 02 64 6B
941
-                15 00 02 65 75
942
-                15 00 02 66 0B
943
-                15 00 02 67 74
944
-                15 00 02 68 01
945
-                15 00 02 69 64
946
-                15 00 02 6A 65
947
-                15 00 02 6B 00
948
-                15 00 02 6C 00
949
-                15 00 02 6D 04
950
-                15 00 02 6E 04
951
-                15 00 02 6F 89
952
-                15 00 02 70 00
953
-		       15 00 02 71 00
954
-                15 00 02 72 06
955
-                15 00 02 73 7B
956
-                15 00 02 74 00
957
-                15 00 02 75 3C
958
-                15 00 02 76 00
959
-                15 00 02 77 0D
960
-                15 00 02 78 2C
961
-                15 00 02 79 00
962
-                15 00 02 7A 00
963
-                15 00 02 7B 00
964
-                15 00 02 7C 00
965
-                15 00 02 7D 03
966
-                15 00 02 7E 7B
967
-                15 00 02 E0 04
968
-                15 00 02 09 14
969
-                15 00 02 E0 00
970
-                15 00 02 E6 02
971
-                15 00 02 E7 0C
972
-                15 78 02 11 00
973
-                15 05 02 29 00
693
+            39 00 04 FF 98 81 03
694
+			15 00 02 01 00
695
+			15 00 02 02 00
696
+			15 00 02 03 53     
697
+			15 00 02 04 D3     
698
+			15 00 02 05 00     
699
+			15 00 02 06 0D     
700
+			15 00 02 07 08     
701
+			15 00 02 08 00     
702
+			15 00 02 09 00     
703
+			15 00 02 0a 00     
704
+			15 00 02 0b 00     
705
+			15 00 02 0c 00     
706
+			15 00 02 0d 00     
707
+			15 00 02 0e 00     
708
+			15 00 02 0f 28     
709
+			15 00 02 10 28     
710
+			15 00 02 11 00     
711
+			15 00 02 12 00     
712
+			15 00 02 13 00     
713
+			15 00 02 14 00     
714
+			15 00 02 15 00     
715
+			15 00 02 16 00     
716
+			15 00 02 17 00     
717
+			15 00 02 18 00     
718
+			15 00 02 19 00     
719
+			15 00 02 1a 00     
720
+			15 00 02 1b 00     
721
+			15 00 02 1c 00     
722
+			15 00 02 1d 00     
723
+			15 00 02 1e 40     
724
+			15 00 02 1f 80     
725
+			15 00 02 20 06     
726
+			15 00 02 21 01     
727
+			15 00 02 22 00     
728
+			15 00 02 23 00     
729
+			15 00 02 24 00     
730
+			15 00 02 25 00     
731
+			15 00 02 26 00     
732
+			15 00 02 27 00     
733
+			15 00 02 28 33     
734
+			15 00 02 29 33     
735
+			15 00 02 2a 00     
736
+			15 00 02 2b 00     
737
+			15 00 02 2c 00     
738
+			15 00 02 2d 00     
739
+			15 00 02 2e 00     
740
+			15 00 02 2f 00     
741
+			15 00 02 30 00     
742
+			15 00 02 31 00     
743
+			15 00 02 32 00     
744
+			15 00 02 33 00     
745
+			15 00 02 34 03     
746
+			15 00 02 35 00     
747
+			15 00 02 36 00     
748
+			15 00 02 37 00     
749
+			15 00 02 38 96     
750
+			15 00 02 39 00
751
+			15 00 02 3a 00 
752
+			15 00 02 3b 00
753
+			15 00 02 3c 00
754
+			15 00 02 3d 00
755
+			15 00 02 3e 00
756
+			15 00 02 3f 00
757
+			15 00 02 40 00
758
+			15 00 02 41 00
759
+			15 00 02 42 00
760
+			15 00 02 43 00  
761
+			15 00 02 44 00	 
762
+			15 00 02 50 00
763
+			15 00 02 51 23
764
+			15 00 02 52 45
765
+			15 00 02 53 67
766
+			15 00 02 54 89
767
+			15 00 02 55 AB
768
+			15 00 02 56 01
769
+			15 00 02 57 23
770
+			15 00 02 58 45
771
+			15 00 02 59 67
772
+			15 00 02 5a 89
773
+			15 00 02 5b AB
774
+			15 00 02 5c CD
775
+			15 00 02 5d EF
776
+			15 00 02 5e 00
777
+			15 00 02 5f 08     
778
+			15 00 02 60 08     
779
+			15 00 02 61 06     
780
+			15 00 02 62 06     
781
+			15 00 02 63 01     
782
+			15 00 02 64 01     
783
+			15 00 02 65 00     
784
+			15 00 02 66 00     
785
+			15 00 02 67 02     
786
+			15 00 02 68 15     
787
+			15 00 02 69 15     
788
+			15 00 02 6a 14     
789
+			15 00 02 6b 14     
790
+			15 00 02 6c 0D     
791
+			15 00 02 6d 0D     
792
+			15 00 02 6e 0C      
793
+			15 00 02 6f 0C     
794
+			15 00 02 70 0F     
795
+			15 00 02 71 0F     
796
+			15 00 02 72 0E     
797
+			15 00 02 73 0E     
798
+			15 00 02 74 02     
799
+			15 00 02 75 08     
800
+			15 00 02 76 08     
801
+			15 00 02 77 06     
802
+			15 00 02 78 06     
803
+			15 00 02 79 01     
804
+			15 00 02 7a 01     
805
+			15 00 02 7b 00     
806
+			15 00 02 7c 00     
807
+			15 00 02 7d 02     
808
+			15 00 02 7e 15     
809
+			15 00 02 7f 15     
810
+			15 00 02 80 14     
811
+			15 00 02 81 14     
812
+			15 00 02 82 0D     
813
+			15 00 02 83 0D     
814
+			15 00 02 84 0C     
815
+			15 00 02 85 0C     
816
+			15 00 02 86 0F     
817
+			15 00 02 87 0F     
818
+			15 00 02 88 0E     
819
+			15 00 02 89 0E     
820
+			15 00 02 8A 02     
821
+			39 00 04 FF 98 81 04
822
+			15 00 02 C5 3A      
823
+			15 00 02 6E 2B      
824
+			15 00 02 6F 37      
825
+			15 00 02 3A 24      
826
+			15 00 02 8D 1A      
827
+			15 00 02 87 BA      
828
+			15 00 02 B2 D1
829
+			15 00 02 88 0B
830
+			15 00 02 38 01      
831
+			15 00 02 39 00
832
+			15 00 02 B5 02      
833
+			15 00 02 31 25      
834
+			15 00 02 3B 98  		
835
+			39 00 04 FF 98 81 01
836
+			15 00 02 22 0A      
837
+			15 00 02 31 00      
838
+			15 00 02 53 3D      
839
+			15 00 02 55 3D      
840
+			15 00 02 50 85      
841
+			15 00 02 51 80      
842
+			15 00 02 60 06      
843
+			15 00 02 62 20
844
+			15 00 02 A0 00
845
+			15 00 02 A1 21
846
+			15 00 02 A2 35
847
+			15 00 02 A3 19
848
+			15 00 02 A4 1E
849
+			15 00 02 A5 33
850
+			15 00 02 A6 27
851
+			15 00 02 A7 26
852
+			15 00 02 A8 AF
853
+			15 00 02 A9 1B
854
+			15 00 02 AA 27
855
+			15 00 02 AB 8D
856
+			15 00 02 AC 1A
857
+			15 00 02 AD 1B
858
+			15 00 02 AE 50
859
+			15 00 02 AF 26
860
+			15 00 02 B0 2B
861
+			15 00 02 B1 54
862
+			15 00 02 B2 5E
863
+			15 00 02 B3 23
864
+			15 00 02 C0 00
865
+			15 00 02 C1 21
866
+			15 00 02 C2 35
867
+			15 00 02 C3 19
868
+			15 00 02 C4 1E
869
+			15 00 02 C5 33
870
+			15 00 02 C6 27
871
+			15 00 02 C7 26
872
+			15 00 02 C8 AF
873
+			15 00 02 C9 1B
874
+			15 00 02 CA 27
875
+			15 00 02 CB 8D
876
+			15 00 02 CC 1A
877
+			15 00 02 CD 1B
878
+			15 00 02 CE 50
879
+			15 00 02 CF 26
880
+			15 00 02 D0 2B
881
+			15 00 02 D1 54
882
+			15 00 02 D2 5E
883
+			15 00 02 D3 23		
884
+			39 00 04 FF 98 81 00
885
+			15 78 01 11 
886
+            15 05 01 29 
974
887
         ];
975
888
 
976
-        panel-exit-sequence = [
977
-                05 00 01 28
978
-                05 00 01 10
979
-        ];
889
+		panel-exit-sequence = [
890
+			05 00 01 28
891
+			05 00 01 10
892
+		];
980
893
 
981
894
          disp_timings1: display-timings {
982
895
                                         native-mode = <&dsi1_timing0>;
..
..
@@ -1029,13 +942,34 @@
1029
942
 	status = "okay";
1030
943
 };
1031
944
 
945
+&hdmi {
946
+	status = "okay";
947
+	rockchip,phy-table =
948
+		<92812500  0x8009 0x0000 0x0270>,
949
+		<165000000 0x800b 0x0000 0x026d>,
950
+		<185625000 0x800b 0x0000 0x01ed>,
951
+		<297000000 0x800b 0x0000 0x01ad>,
952
+		<594000000 0x8029 0x0000 0x0088>,
953
+		<000000000 0x0000 0x0000 0x0000>;
954
+};
1032
955
 
956
+&hdmi_in_vp0 {
957
+	status = "okay";
958
+};
959
+
960
+&hdmi_in_vp1 {
961
+	status = "disabled";
962
+};
963
+
964
+&hdmi_sound {
965
+	status = "okay";
966
+};
1033
967
 
1034
968
 &i2c0 {
1035
969
 	status = "okay";
1036
970
 
1037
971
 	vdd_cpu: tcs4525@1c {
1038
-		compatible = "tcs,tcs452x";
972
+		compatible = "tcs,tcs4525";
1039
973
 		reg = <0x1c>;
1040
974
 		vin-supply = <&vcc5v0_sys>;
1041
975
 		regulator-compatible = "fan53555-reg";
..
..
@@ -1043,7 +977,6 @@
1043
977
 		regulator-min-microvolt = <712500>;
1044
978
 		regulator-max-microvolt = <1390000>;
1045
979
 		regulator-init-microvolt = <900000>;
1046
-		regulator-initial-mode = <1>;
1047
980
 		regulator-ramp-delay = <2300>;
1048
981
 		fcs,suspend-voltage-selector = <1>;
1049
982
 		regulator-boot-on;
..
..
@@ -1205,8 +1138,8 @@
1205
1138
 			vccio_acodec: LDO_REG4 {
1206
1139
 				regulator-always-on;
1207
1140
 				regulator-boot-on;
1208
-				regulator-min-microvolt = <3300000>;
1209
-				regulator-max-microvolt = <3300000>;
1141
+				regulator-min-microvolt = <3000000>;
1142
+				regulator-max-microvolt = <3000000>;
1210
1143
 				regulator-name = "vccio_acodec";
1211
1144
 				regulator-state-mem {
1212
1145
 					regulator-off-in-suspend;
..
..
@@ -1301,7 +1234,7 @@
1301
1234
 		};
1302
1235
 
1303
1236
 		rk809_codec: codec {
1304
-			#sound-dai-cells = <0>;
1237
+			#sound-dai-cells = <1>;
1305
1238
 			compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
1306
1239
 			clocks = <&cru I2S1_MCLKOUT>;
1307
1240
 			clock-names = "mclk";
..
..
@@ -1320,15 +1253,6 @@
1320
1253
 
1321
1254
 &i2c1 {
1322
1255
 	status = "okay";
1323
-
1324
-	gt1x: gt1x@14 {
1325
-		compatible = "goodix,gt1x";
1326
-		reg = <0x14>;
1327
-		pinctrl-names = "default";
1328
-		pinctrl-0 = <&touch_gpio>;
1329
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1330
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1331
-	};
1332
1256
 };
1333
1257
 
1334
1258
 &i2c5 {
..
..
@@ -1361,6 +1285,12 @@
1361
1285
 		     &i2s1m0_lrcktx
1362
1286
 		     &i2s1m0_sdi0
1363
1287
 		     &i2s1m0_sdo0>;
1288
+};
1289
+
1290
+&i2s3_2ch {
1291
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1292
+	rockchip,bclk-fs = <32>;
1293
+	status = "disabled";
1364
1294
 };
1365
1295
 
1366
1296
 &iep {
..
..
@@ -1399,6 +1329,12 @@
1399
1329
 
1400
1330
 &pinctrl {
1401
1331
 
1332
+	headphone {
1333
+		hp_det: hp-det {
1334
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
+		};
1336
+	};
1337
+
1402
1338
 	mxc6655xa {
1403
1339
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
1404
1340
 			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
..
..
@@ -1413,12 +1349,12 @@
1413
1349
 
1414
1350
 		soc_slppin_gpio: soc_slppin_gpio {
1415
1351
 			rockchip,pins =
1416
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1352
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
1417
1353
 		};
1418
1354
 
1419
1355
 		soc_slppin_slp: soc_slppin_slp {
1420
1356
 			rockchip,pins =
1421
-				<0 RK_PA2 1 &pcfg_pull_up>;
1357
+				<0 RK_PA2 1 &pcfg_pull_none>;
1422
1358
 		};
1423
1359
 
1424
1360
 		soc_slppin_rst: soc_slppin_rst {
..
..
@@ -1633,7 +1569,10 @@
1633
1569
 	status = "okay";
1634
1570
 };
1635
1571
 
1636
-
1572
+&route_hdmi {
1573
+	status = "okay";
1574
+	connect = <&vp0_out_hdmi>;
1575
+};
1637
1576
 
1638
1577
 &saradc {
1639
1578
 	status = "okay";
..
..
@@ -1642,15 +1581,18 @@
1642
1581
 
1643
1582
 &sdhci {
1644
1583
 	bus-width = <8>;
1645
-	supports-emmc;
1584
+	no-sdio;
1585
+	no-sd;
1646
1586
 	non-removable;
1647
1587
 	max-frequency = <200000000>;
1588
+	full-pwr-cycle-in-suspend;
1648
1589
 	status = "okay";
1649
1590
 };
1650
1591
 
1651
1592
 &sdmmc0 {
1652
1593
 	max-frequency = <150000000>;
1653
-	supports-sd;
1594
+	no-sdio;
1595
+	no-mmc;
1654
1596
 	bus-width = <4>;
1655
1597
 	cap-mmc-highspeed;
1656
1598
 	cap-sd-highspeed;
..
..
@@ -1730,15 +1672,6 @@
1730
1672
 };
1731
1673
 
1732
1674
 &usbhost_dwc3 {
1733
-//	phys = <&u2phy0_host>;
1734
-//	phy-names = "usb2-phy";
1735
-//	maximum-speed = "high-speed";
1736
-//	snps,dis_u2_susphy_quirk;
1737
-	status = "okay";
1738
-};
1739
-
1740
-&combphy1_usq {
1741
-//	rockchip,dis-u3otg1-port;
1742
1675
 	status = "okay";
1743
1676
 };
1744
1677
 
..
..
@@ -1771,8 +1704,8 @@
1771
1704
 
1772
1705
 &vop {
1773
1706
 	status = "okay";
1774
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1775
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1707
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1708
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
1776
1709
 };
1777
1710
 
1778
1711
 &vop_mmu {