forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2 
 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -103,7 +103,7 @@
103103 
104104 	backlight1: backlight1 {
105105 		compatible = "pwm-backlight";
106
-		pwms = <&pwm5 0 25000 0>;
106
+		pwms = <&pwm6 0 25000 0>;
107107 		brightness-levels = <
108108 			  0  20  20  21  21  22  22  23
109109 			 23  24  24  25  25  26  26  27
....@@ -141,6 +141,27 @@
141141 		default-brightness-level = <200>;
142142 	};
143143 
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
+
144165 	dc_12v: dc-12v {
145166 		compatible = "regulator-fixed";
146167 		regulator-name = "dc_12v";
....@@ -151,20 +172,38 @@
151172 	};
152173 
153174 	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";
154179 		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
+		};
160187 	};
161188 
162189 	leds: leds {
163190 		compatible = "gpio-leds";
164
-		sys_led: sys_led {
165
-			gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
166
-			linux,default-trigger = "heartbeat";
191
+		run_led: run_led {
192
+			gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
193
+			default-state = "on";
194
+//			linux,default-trigger = "heartbeat";
167195 		};
196
+	/*	
197
+		sig_led: sig_led {
198
+			gpios = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>;
199
+			default-state = "on";
200
+		};
201
+		
202
+		err_led: err_led {
203
+			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
204
+			default-state = "on";
205
+		};
206
+		*/
168207 	};
169208 
170209 	pdmics: dummy-codec {
....@@ -291,7 +330,6 @@
291330 		regulator-min-microvolt = <3300000>;
292331 		regulator-max-microvolt = <3300000>;
293332 		enable-active-high;
294
-		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
295333 		vin-supply = <&vcc3v3_sys>;
296334 
297335 		regulator-state-mem {
....@@ -306,7 +344,6 @@
306344 		regulator-min-microvolt = <3300000>;
307345 		regulator-max-microvolt = <3300000>;
308346 		enable-active-high;
309
-		gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
310347 		vin-supply = <&vcc3v3_sys>;
311348 
312349 		regulator-state-mem {
....@@ -335,6 +372,8 @@
335372 		compatible = "wlan-platdata";
336373 		rockchip,grf = <&grf>;
337374 		wifi_chip_type = "ap6398s";
375
+		clocks = <&rk809 1>;
376
+		clock-names = "ext_clock";
338377 		status = "okay";
339378 	};
340379 
....@@ -364,30 +403,6 @@
364403 	status = "okay";
365404 };
366405 
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
-
391406 &cpu0 {
392407 	cpu-supply = <&vdd_cpu>;
393408 };
....@@ -395,6 +410,7 @@
395410 &dfi {
396411 	status = "okay";
397412 };
413
+
398414 
399415 &dmc {
400416 	center-supply = <&vdd_logic>;
....@@ -419,267 +435,198 @@
419435 		dsi,format = <MIPI_DSI_FMT_RGB888>;
420436 		dsi,lanes  = <4>;
421437 		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
438
+			39 00 05 FF 03 98 81 03
439
+			39 00 03 01 01 00
440
+			39 00 03 02 01 00
441
+			39 00 03 03 01 53     
442
+			39 00 03 04 01 D3     
443
+			39 00 03 05 01 00     
444
+			39 00 03 06 01 0D     
445
+			39 00 03 07 01 08     
446
+			39 00 03 08 01 00     
447
+			39 00 03 09 01 00     
448
+			39 00 03 0a 01 00     
449
+			39 00 03 0b 01 00     
450
+			39 00 03 0c 01 00     
451
+			39 00 03 0d 01 00     
452
+			39 00 03 0e 01 00     
453
+			39 00 03 0f 01 28     
454
+			39 00 03 10 01 28     
455
+			39 00 03 11 01 00     
456
+			39 00 03 12 01 00     
457
+			39 00 03 13 01 00     
458
+			39 00 03 14 01 00     
459
+			39 00 03 15 01 00     
460
+			39 00 03 16 01 00     
461
+			39 00 03 17 01 00     
462
+			39 00 03 18 01 00     
463
+			39 00 03 19 01 00     
464
+			39 00 03 1a 01 00     
465
+			39 00 03 1b 01 00     
466
+			39 00 03 1c 01 00     
467
+			39 00 03 1d 01 00     
468
+			39 00 03 1e 01 40     
469
+			39 00 03 1f 01 80     
470
+			39 00 03 20 01 06     
471
+			39 00 03 21 01 01     
472
+			39 00 03 22 01 00     
473
+			39 00 03 23 01 00     
474
+			39 00 03 24 01 00     
475
+			39 00 03 25 01 00     
476
+			39 00 03 26 01 00     
477
+			39 00 03 27 01 00     
478
+			39 00 03 28 01 33     
479
+			39 00 03 29 01 33     
480
+			39 00 03 2a 01 00     
481
+			39 00 03 2b 01 00     
482
+			39 00 03 2c 01 00     
483
+			39 00 03 2d 01 00     
484
+			39 00 03 2e 01 00     
485
+			39 00 03 2f 01 00     
486
+			39 00 03 30 01 00     
487
+			39 00 03 31 01 00     
488
+			39 00 03 32 01 00     
489
+			39 00 03 33 01 00     
490
+			39 00 03 34 01 03     
491
+			39 00 03 35 01 00     
492
+			39 00 03 36 01 00     
493
+			39 00 03 37 01 00     
494
+			39 00 03 38 01 96     
495
+			39 00 03 39 01 00
496
+			39 00 03 3a 01 00 
497
+			39 00 03 3b 01 00
498
+			39 00 03 3c 01 00
499
+			39 00 03 3d 01 00
500
+			39 00 03 3e 01 00
501
+			39 00 03 3f 01 00
502
+			39 00 03 40 01 00
503
+			39 00 03 41 01 00
504
+			39 00 03 42 01 00
505
+			39 00 03 43 01 00  
506
+			39 00 03 44 01 00	 
507
+			39 00 03 50 01 00
508
+			39 00 03 51 01 23
509
+			39 00 03 52 01 45
510
+			39 00 03 53 01 67
511
+			39 00 03 54 01 89
512
+			39 00 03 55 01 AB
513
+			39 00 03 56 01 01
514
+			39 00 03 57 01 23
515
+			39 00 03 58 01 45
516
+			39 00 03 59 01 67
517
+			39 00 03 5a 01 89
518
+			39 00 03 5b 01 AB
519
+			39 00 03 5c 01 CD
520
+			39 00 03 5d 01 EF
521
+			39 00 03 5e 01 00
522
+			39 00 03 5f 01 08     
523
+			39 00 03 60 01 08     
524
+			39 00 03 61 01 06     
525
+			39 00 03 62 01 06     
526
+			39 00 03 63 01 01     
527
+			39 00 03 64 01 01     
528
+			39 00 03 65 01 00     
529
+			39 00 03 66 01 00     
530
+			39 00 03 67 01 02     
531
+			39 00 03 68 01 15     
532
+			39 00 03 69 01 15     
533
+			39 00 03 6a 01 14     
534
+			39 00 03 6b 01 14     
535
+			39 00 03 6c 01 0D     
536
+			39 00 03 6d 01 0D     
537
+			39 00 03 6e 01 0C      
538
+			39 00 03 6f 01 0C     
539
+			39 00 03 70 01 0F     
540
+			39 00 03 71 01 0F     
541
+			39 00 03 72 01 0E     
542
+			39 00 03 73 01 0E     
543
+			39 00 03 74 01 02     
544
+			39 00 03 75 01 08     
545
+			39 00 03 76 01 08     
546
+			39 00 03 77 01 06     
547
+			39 00 03 78 01 06     
548
+			39 00 03 79 01 01     
549
+			39 00 03 7a 01 01     
550
+			39 00 03 7b 01 00     
551
+			39 00 03 7c 01 00     
552
+			39 00 03 7d 01 02     
553
+			39 00 03 7e 01 15     
554
+			39 00 03 7f 01 15     
555
+			39 00 03 80 01 14     
556
+			39 00 03 81 01 14     
557
+			39 00 03 82 01 0D     
558
+			39 00 03 83 01 0D     
559
+			39 00 03 84 01 0C     
560
+			39 00 03 85 01 0C     
561
+			39 00 03 86 01 0F     
562
+			39 00 03 87 01 0F     
563
+			39 00 03 88 01 0E     
564
+			39 00 03 89 01 0E     
565
+			39 00 03 8A 01 02     
566
+			39 00 05 FF 03 98 81 04
567
+			39 00 03 C5 01 3A      
568
+			39 00 03 6E 01 2B      
569
+			39 00 03 6F 01 37      
570
+			39 00 03 3A 01 24      
571
+			39 00 03 8D 01 1A      
572
+			39 00 03 87 01 BA      
573
+			39 00 03 B2 01 D1
574
+			39 00 03 88 01 0B
575
+			39 00 03 38 01 01      
576
+			39 00 03 39 01 00
577
+			39 00 03 B5 01 02      
578
+			39 00 03 31 01 25      
579
+			39 00 03 3B 01 98  		
580
+			39 00 05 FF 03 98 81 01
581
+			39 00 03 22 01 0A      
582
+			39 00 03 31 01 00      
583
+			39 00 03 53 01 3D      
584
+			39 00 03 55 01 3D      
585
+			39 00 03 50 01 85      
586
+			39 00 03 51 01 80      
587
+			39 00 03 60 01 06      
588
+			39 00 03 62 01 20
589
+			39 00 03 A0 01 00
590
+			39 00 03 A1 01 21
591
+			39 00 03 A2 01 35
592
+			39 00 03 A3 01 19
593
+			39 00 03 A4 01 1E
594
+			39 00 03 A5 01 33
595
+			39 00 03 A6 01 27
596
+			39 00 03 A7 01 26
597
+			39 00 03 A8 01 AF
598
+			39 00 03 A9 01 1B
599
+			39 00 03 AA 01 27
600
+			39 00 03 AB 01 8D
601
+			39 00 03 AC 01 1A
602
+			39 00 03 AD 01 1B
603
+			39 00 03 AE 01 50
604
+			39 00 03 AF 01 26
605
+			39 00 03 B0 01 2B
606
+			39 00 03 B1 01 54
607
+			39 00 03 B2 01 5E
608
+			39 00 03 B3 01 23
609
+			39 00 03 C0 01 00
610
+			39 00 03 C1 01 21
611
+			39 00 03 C2 01 35
612
+			39 00 03 C3 01 19
613
+			39 00 03 C4 01 1E
614
+			39 00 03 C5 01 33
615
+			39 00 03 C6 01 27
616
+			39 00 03 C7 01 26
617
+			39 00 03 C8 01 AF
618
+			39 00 03 C9 01 1B
619
+			39 00 03 CA 01 27
620
+			39 00 03 CB 01 8D
621
+			39 00 03 CC 01 1A
622
+			39 00 03 CD 01 1B
623
+			39 00 03 CE 01 50
624
+			39 00 03 CF 01 26
625
+			39 00 03 D0 01 2B
626
+			39 00 03 D1 01 54
627
+			39 00 03 D2 01 5E
628
+			39 00 03 D3 01 23		
629
+			39 00 05 FF 03 98 81 00
683630 		];
684631 
685632 		panel-exit-sequence = [
....@@ -740,303 +687,242 @@
740687 		status = "okay";
741688 		compatible = "simple-panel-dsi";
742689 		reg = <0>;
743
-		backlight = <&backlight1>;
744
-		reset-delay-ms = <60>;
745
-		enable-delay-ms = <60>;
746
-		prepare-delay-ms = <60>;
747
-		unprepare-delay-ms = <60>;
748
-		disable-delay-ms = <60>;
749
-		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
750
-			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
751
-		dsi,format = <MIPI_DSI_FMT_RGB888>;
752
-		dsi,lanes  = <4>;
753
-		panel-init-sequence = [
754
-			23 00 02 FE 21
755
-			23 00 02 04 00
756
-			23 00 02 00 64
757
-			23 00 02 2A 00
758
-			23 00 02 26 64
759
-			23 00 02 54 00
760
-			23 00 02 50 64
761
-			23 00 02 7B 00
762
-			23 00 02 77 64
763
-			23 00 02 A2 00
764
-			23 00 02 9D 64
765
-			23 00 02 C9 00
766
-			23 00 02 C5 64
767
-			23 00 02 01 71
768
-			23 00 02 27 71
769
-			23 00 02 51 71
770
-			23 00 02 78 71
771
-			23 00 02 9E 71
772
-			23 00 02 C6 71
773
-			23 00 02 02 89
774
-			23 00 02 28 89
775
-			23 00 02 52 89
776
-			23 00 02 79 89
777
-			23 00 02 9F 89
778
-			23 00 02 C7 89
779
-			23 00 02 03 9E
780
-			23 00 02 29 9E
781
-			23 00 02 53 9E
782
-			23 00 02 7A 9E
783
-			23 00 02 A0 9E
784
-			23 00 02 C8 9E
785
-			23 00 02 09 00
786
-			23 00 02 05 B0
787
-			23 00 02 31 00
788
-			23 00 02 2B B0
789
-			23 00 02 5A 00
790
-			23 00 02 55 B0
791
-			23 00 02 80 00
792
-			23 00 02 7C B0
793
-			23 00 02 A7 00
794
-			23 00 02 A3 B0
795
-			23 00 02 CE 00
796
-			23 00 02 CA B0
797
-			23 00 02 06 C0
798
-			23 00 02 2D C0
799
-			23 00 02 56 C0
800
-			23 00 02 7D C0
801
-			23 00 02 A4 C0
802
-			23 00 02 CB C0
803
-			23 00 02 07 CF
804
-			23 00 02 2F CF
805
-			23 00 02 58 CF
806
-			23 00 02 7E CF
807
-			23 00 02 A5 CF
808
-			23 00 02 CC CF
809
-			23 00 02 08 DD
810
-			23 00 02 30 DD
811
-			23 00 02 59 DD
812
-			23 00 02 7F DD
813
-			23 00 02 A6 DD
814
-			23 00 02 CD DD
815
-			23 00 02 0E 15
816
-			23 00 02 0A E9
817
-			23 00 02 36 15
818
-			23 00 02 32 E9
819
-			23 00 02 5F 15
820
-			23 00 02 5B E9
821
-			23 00 02 85 15
822
-			23 00 02 81 E9
823
-			23 00 02 AD 15
824
-			23 00 02 A9 E9
825
-			23 00 02 D3 15
826
-			23 00 02 CF E9
827
-			23 00 02 0B 14
828
-			23 00 02 33 14
829
-			23 00 02 5C 14
830
-			23 00 02 82 14
831
-			23 00 02 AA 14
832
-			23 00 02 D0 14
833
-			23 00 02 0C 36
834
-			23 00 02 34 36
835
-			23 00 02 5D 36
836
-			23 00 02 83 36
837
-			23 00 02 AB 36
838
-			23 00 02 D1 36
839
-			23 00 02 0D 6B
840
-			23 00 02 35 6B
841
-			23 00 02 5E 6B
842
-			23 00 02 84 6B
843
-			23 00 02 AC 6B
844
-			23 00 02 D2 6B
845
-			23 00 02 13 5A
846
-			23 00 02 0F 94
847
-			23 00 02 3B 5A
848
-			23 00 02 37 94
849
-			23 00 02 64 5A
850
-			23 00 02 60 94
851
-			23 00 02 8A 5A
852
-			23 00 02 86 94
853
-			23 00 02 B2 5A
854
-			23 00 02 AE 94
855
-			23 00 02 D8 5A
856
-			23 00 02 D4 94
857
-			23 00 02 10 D1
858
-			23 00 02 38 D1
859
-			23 00 02 61 D1
860
-			23 00 02 87 D1
861
-			23 00 02 AF D1
862
-			23 00 02 D5 D1
863
-			23 00 02 11 04
864
-			23 00 02 39 04
865
-			23 00 02 62 04
866
-			23 00 02 88 04
867
-			23 00 02 B0 04
868
-			23 00 02 D6 04
869
-			23 00 02 12 05
870
-			23 00 02 3A 05
871
-			23 00 02 63 05
872
-			23 00 02 89 05
873
-			23 00 02 B1 05
874
-			23 00 02 D7 05
875
-			23 00 02 18 AA
876
-			23 00 02 14 36
877
-			23 00 02 42 AA
878
-			23 00 02 3D 36
879
-			23 00 02 69 AA
880
-			23 00 02 65 36
881
-			23 00 02 8F AA
882
-			23 00 02 8B 36
883
-			23 00 02 B7 AA
884
-			23 00 02 B3 36
885
-			23 00 02 DD AA
886
-			23 00 02 D9 36
887
-			23 00 02 15 74
888
-			23 00 02 3F 74
889
-			23 00 02 66 74
890
-			23 00 02 8C 74
891
-			23 00 02 B4 74
892
-			23 00 02 DA 74
893
-			23 00 02 16 9F
894
-			23 00 02 40 9F
895
-			23 00 02 67 9F
896
-			23 00 02 8D 9F
897
-			23 00 02 B5 9F
898
-			23 00 02 DB 9F
899
-			23 00 02 17 DC
900
-			23 00 02 41 DC
901
-			23 00 02 68 DC
902
-			23 00 02 8E DC
903
-			23 00 02 B6 DC
904
-			23 00 02 DC DC
905
-			23 00 02 1D FF
906
-			23 00 02 19 03
907
-			23 00 02 47 FF
908
-			23 00 02 43 03
909
-			23 00 02 6E FF
910
-			23 00 02 6A 03
911
-			23 00 02 94 FF
912
-			23 00 02 90 03
913
-			23 00 02 BC FF
914
-			23 00 02 B8 03
915
-			23 00 02 E2 FF
916
-			23 00 02 DE 03
917
-			23 00 02 1A 35
918
-			23 00 02 44 35
919
-			23 00 02 6B 35
920
-			23 00 02 91 35
921
-			23 00 02 B9 35
922
-			23 00 02 DF 35
923
-			23 00 02 1B 45
924
-			23 00 02 45 45
925
-			23 00 02 6C 45
926
-			23 00 02 92 45
927
-			23 00 02 BA 45
928
-			23 00 02 E0 45
929
-			23 00 02 1C 55
930
-			23 00 02 46 55
931
-			23 00 02 6D 55
932
-			23 00 02 93 55
933
-			23 00 02 BB 55
934
-			23 00 02 E1 55
935
-			23 00 02 22 FF
936
-			23 00 02 1E 68
937
-			23 00 02 4C FF
938
-			23 00 02 48 68
939
-			23 00 02 73 FF
940
-			23 00 02 6F 68
941
-			23 00 02 99 FF
942
-			23 00 02 95 68
943
-			23 00 02 C1 FF
944
-			23 00 02 BD 68
945
-			23 00 02 E7 FF
946
-			23 00 02 E3 68
947
-			23 00 02 1F 7E
948
-			23 00 02 49 7E
949
-			23 00 02 70 7E
950
-			23 00 02 96 7E
951
-			23 00 02 BE 7E
952
-			23 00 02 E4 7E
953
-			23 00 02 20 97
954
-			23 00 02 4A 97
955
-			23 00 02 71 97
956
-			23 00 02 97 97
957
-			23 00 02 BF 97
958
-			23 00 02 E5 97
959
-			23 00 02 21 B5
960
-			23 00 02 4B B5
961
-			23 00 02 72 B5
962
-			23 00 02 98 B5
963
-			23 00 02 C0 B5
964
-			23 00 02 E6 B5
965
-			23 00 02 25 F0
966
-			23 00 02 23 E8
967
-			23 00 02 4F F0
968
-			23 00 02 4D E8
969
-			23 00 02 76 F0
970
-			23 00 02 74 E8
971
-			23 00 02 9C F0
972
-			23 00 02 9A E8
973
-			23 00 02 C4 F0
974
-			23 00 02 C2 E8
975
-			23 00 02 EA F0
976
-			23 00 02 E8 E8
977
-			23 00 02 24 FF
978
-			23 00 02 4E FF
979
-			23 00 02 75 FF
980
-			23 00 02 9B FF
981
-			23 00 02 C3 FF
982
-			23 00 02 E9 FF
983
-			23 00 02 FE 3D
984
-			23 00 02 00 04
985
-			23 00 02 FE 23
986
-			23 00 02 08 82
987
-			23 00 02 0A 00
988
-			23 00 02 0B 00
989
-			23 00 02 0C 01
990
-			23 00 02 16 00
991
-			23 00 02 18 02
992
-			23 00 02 1B 04
993
-			23 00 02 19 04
994
-			23 00 02 1C 81
995
-			23 00 02 1F 00
996
-			23 00 02 20 03
997
-			23 00 02 23 04
998
-			23 00 02 21 01
999
-			23 00 02 54 63
1000
-			23 00 02 55 54
1001
-			23 00 02 6E 45
1002
-			23 00 02 6D 36
1003
-			23 00 02 FE 3D
1004
-			23 00 02 55 78
1005
-			23 00 02 FE 20
1006
-			23 00 02 26 30
1007
-			23 00 02 FE 3D
1008
-			23 00 02 20 71
1009
-			23 00 02 50 8F
1010
-			23 00 02 51 8F
1011
-			23 00 02 FE 00
1012
-			23 00 02 35 00
1013
-			05 78 01 11
1014
-			05 1E 01 29
1015
-		];
690
+		power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
691
+		vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
692
+		reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
693
+		vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
694
+		reset-delay-ms = <200>;
695
+        enable-delay-ms = <60>;
696
+        init-delay-ms = <120>;
697
+        disable-delay-ms = <60>;
698
+        prepare-delay-ms = <120>;
699
+        unprepare-delay-ms = <120>;
700
+        backlight = <&backlight1>;
701
+        dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
702
+                MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
703
+        dsi,format = <MIPI_DSI_FMT_RGB888>;
704
+        dsi,lanes  = <4>;
705
+
706
+        panel-init-sequence = [
707
+            39 00 04 FF 98 81 03
708
+			15 00 02 01 00
709
+			15 00 02 02 00
710
+			15 00 02 03 53     
711
+			15 00 02 04 D3     
712
+			15 00 02 05 00     
713
+			15 00 02 06 0D     
714
+			15 00 02 07 08     
715
+			15 00 02 08 00     
716
+			15 00 02 09 00     
717
+			15 00 02 0a 00     
718
+			15 00 02 0b 00     
719
+			15 00 02 0c 00     
720
+			15 00 02 0d 00     
721
+			15 00 02 0e 00     
722
+			15 00 02 0f 28     
723
+			15 00 02 10 28     
724
+			15 00 02 11 00     
725
+			15 00 02 12 00     
726
+			15 00 02 13 00     
727
+			15 00 02 14 00     
728
+			15 00 02 15 00     
729
+			15 00 02 16 00     
730
+			15 00 02 17 00     
731
+			15 00 02 18 00     
732
+			15 00 02 19 00     
733
+			15 00 02 1a 00     
734
+			15 00 02 1b 00     
735
+			15 00 02 1c 00     
736
+			15 00 02 1d 00     
737
+			15 00 02 1e 40     
738
+			15 00 02 1f 80     
739
+			15 00 02 20 06     
740
+			15 00 02 21 01     
741
+			15 00 02 22 00     
742
+			15 00 02 23 00     
743
+			15 00 02 24 00     
744
+			15 00 02 25 00     
745
+			15 00 02 26 00     
746
+			15 00 02 27 00     
747
+			15 00 02 28 33     
748
+			15 00 02 29 33     
749
+			15 00 02 2a 00     
750
+			15 00 02 2b 00     
751
+			15 00 02 2c 00     
752
+			15 00 02 2d 00     
753
+			15 00 02 2e 00     
754
+			15 00 02 2f 00     
755
+			15 00 02 30 00     
756
+			15 00 02 31 00     
757
+			15 00 02 32 00     
758
+			15 00 02 33 00     
759
+			15 00 02 34 03     
760
+			15 00 02 35 00     
761
+			15 00 02 36 00     
762
+			15 00 02 37 00     
763
+			15 00 02 38 96     
764
+			15 00 02 39 00
765
+			15 00 02 3a 00 
766
+			15 00 02 3b 00
767
+			15 00 02 3c 00
768
+			15 00 02 3d 00
769
+			15 00 02 3e 00
770
+			15 00 02 3f 00
771
+			15 00 02 40 00
772
+			15 00 02 41 00
773
+			15 00 02 42 00
774
+			15 00 02 43 00  
775
+			15 00 02 44 00	 
776
+			15 00 02 50 00
777
+			15 00 02 51 23
778
+			15 00 02 52 45
779
+			15 00 02 53 67
780
+			15 00 02 54 89
781
+			15 00 02 55 AB
782
+			15 00 02 56 01
783
+			15 00 02 57 23
784
+			15 00 02 58 45
785
+			15 00 02 59 67
786
+			15 00 02 5a 89
787
+			15 00 02 5b AB
788
+			15 00 02 5c CD
789
+			15 00 02 5d EF
790
+			15 00 02 5e 00
791
+			15 00 02 5f 08     
792
+			15 00 02 60 08     
793
+			15 00 02 61 06     
794
+			15 00 02 62 06     
795
+			15 00 02 63 01     
796
+			15 00 02 64 01     
797
+			15 00 02 65 00     
798
+			15 00 02 66 00     
799
+			15 00 02 67 02     
800
+			15 00 02 68 15     
801
+			15 00 02 69 15     
802
+			15 00 02 6a 14     
803
+			15 00 02 6b 14     
804
+			15 00 02 6c 0D     
805
+			15 00 02 6d 0D     
806
+			15 00 02 6e 0C      
807
+			15 00 02 6f 0C     
808
+			15 00 02 70 0F     
809
+			15 00 02 71 0F     
810
+			15 00 02 72 0E     
811
+			15 00 02 73 0E     
812
+			15 00 02 74 02     
813
+			15 00 02 75 08     
814
+			15 00 02 76 08     
815
+			15 00 02 77 06     
816
+			15 00 02 78 06     
817
+			15 00 02 79 01     
818
+			15 00 02 7a 01     
819
+			15 00 02 7b 00     
820
+			15 00 02 7c 00     
821
+			15 00 02 7d 02     
822
+			15 00 02 7e 15     
823
+			15 00 02 7f 15     
824
+			15 00 02 80 14     
825
+			15 00 02 81 14     
826
+			15 00 02 82 0D     
827
+			15 00 02 83 0D     
828
+			15 00 02 84 0C     
829
+			15 00 02 85 0C     
830
+			15 00 02 86 0F     
831
+			15 00 02 87 0F     
832
+			15 00 02 88 0E     
833
+			15 00 02 89 0E     
834
+			15 00 02 8A 02     
835
+			39 00 04 FF 98 81 04
836
+			15 00 02 C5 3A      
837
+			15 00 02 6E 2B      
838
+			15 00 02 6F 37      
839
+			15 00 02 3A 24      
840
+			15 00 02 8D 1A      
841
+			15 00 02 87 BA      
842
+			15 00 02 B2 D1
843
+			15 00 02 88 0B
844
+			15 00 02 38 01      
845
+			15 00 02 39 00
846
+			15 00 02 B5 02      
847
+			15 00 02 31 25      
848
+			15 00 02 3B 98  		
849
+			39 00 04 FF 98 81 01
850
+			15 00 02 22 0A      
851
+			15 00 02 31 00      
852
+			15 00 02 53 3D      
853
+			15 00 02 55 3D      
854
+			15 00 02 50 85      
855
+			15 00 02 51 80      
856
+			15 00 02 60 06      
857
+			15 00 02 62 20
858
+			15 00 02 A0 00
859
+			15 00 02 A1 21
860
+			15 00 02 A2 35
861
+			15 00 02 A3 19
862
+			15 00 02 A4 1E
863
+			15 00 02 A5 33
864
+			15 00 02 A6 27
865
+			15 00 02 A7 26
866
+			15 00 02 A8 AF
867
+			15 00 02 A9 1B
868
+			15 00 02 AA 27
869
+			15 00 02 AB 8D
870
+			15 00 02 AC 1A
871
+			15 00 02 AD 1B
872
+			15 00 02 AE 50
873
+			15 00 02 AF 26
874
+			15 00 02 B0 2B
875
+			15 00 02 B1 54
876
+			15 00 02 B2 5E
877
+			15 00 02 B3 23
878
+			15 00 02 C0 00
879
+			15 00 02 C1 21
880
+			15 00 02 C2 35
881
+			15 00 02 C3 19
882
+			15 00 02 C4 1E
883
+			15 00 02 C5 33
884
+			15 00 02 C6 27
885
+			15 00 02 C7 26
886
+			15 00 02 C8 AF
887
+			15 00 02 C9 1B
888
+			15 00 02 CA 27
889
+			15 00 02 CB 8D
890
+			15 00 02 CC 1A
891
+			15 00 02 CD 1B
892
+			15 00 02 CE 50
893
+			15 00 02 CF 26
894
+			15 00 02 D0 2B
895
+			15 00 02 D1 54
896
+			15 00 02 D2 5E
897
+			15 00 02 D3 23		
898
+			39 00 04 FF 98 81 00
899
+			15 78 01 11 
900
+            15 05 01 29 
901
+        ];
1016902 
1017903 		panel-exit-sequence = [
1018904 			05 00 01 28
1019905 			05 00 01 10
1020906 		];
1021907 
1022
-		disp_timings1: display-timings {
1023
-			native-mode = <&dsi1_timing0>;
1024
-			dsi1_timing0: timing0 {
1025
-				clock-frequency = <132000000>;
1026
-				hactive = <1080>;
1027
-				vactive = <1920>;
1028
-				hfront-porch = <15>;
1029
-				hsync-len = <2>;
1030
-				hback-porch = <30>;
1031
-				vfront-porch = <15>;
1032
-				vsync-len = <2>;
1033
-				vback-porch = <15>;
1034
-				hsync-active = <0>;
1035
-				vsync-active = <0>;
1036
-				de-active = <0>;
1037
-				pixelclk-active = <1>;
1038
-			};
1039
-		};
908
+         disp_timings1: display-timings {
909
+                                        native-mode = <&dsi1_timing0>;
910
+                                        dsi1_timing0: timing0 {
911
+                                        clock-frequency = <69000000>;
912
+                                        hactive = <800>;
913
+                                        vactive = <1280>;
914
+                                        hfront-porch = <32>;
915
+                                        hsync-len = <20>;
916
+                                        hback-porch = <20>;
917
+                                        vfront-porch = <16>;
918
+                                        vsync-len = <5>;
919
+                                        vback-porch = <12>;
920
+                                        hsync-active = <0>;
921
+                                        vsync-active = <0>;
922
+                                        de-active = <0>;
923
+                                        pixelclk-active = <1>;
924
+                                };
925
+                        };
1040926 
1041927 		ports {
1042928 			#address-cells = <1>;
....@@ -1070,13 +956,34 @@
1070956 	status = "okay";
1071957 };
1072958 
959
+&hdmi {
960
+	status = "okay";
961
+	rockchip,phy-table =
962
+		<92812500  0x8009 0x0000 0x0270>,
963
+		<165000000 0x800b 0x0000 0x026d>,
964
+		<185625000 0x800b 0x0000 0x01ed>,
965
+		<297000000 0x800b 0x0000 0x01ad>,
966
+		<594000000 0x8029 0x0000 0x0088>,
967
+		<000000000 0x0000 0x0000 0x0000>;
968
+};
1073969 
970
+&hdmi_in_vp0 {
971
+	status = "okay";
972
+};
973
+
974
+&hdmi_in_vp1 {
975
+	status = "disabled";
976
+};
977
+
978
+&hdmi_sound {
979
+	status = "okay";
980
+};
1074981 
1075982 &i2c0 {
1076983 	status = "okay";
1077984 
1078985 	vdd_cpu: tcs4525@1c {
1079
-		compatible = "tcs,tcs452x";
986
+		compatible = "tcs,tcs4525";
1080987 		reg = <0x1c>;
1081988 		vin-supply = <&vcc5v0_sys>;
1082989 		regulator-compatible = "fan53555-reg";
....@@ -1084,7 +991,6 @@
1084991 		regulator-min-microvolt = <712500>;
1085992 		regulator-max-microvolt = <1390000>;
1086993 		regulator-init-microvolt = <900000>;
1087
-		regulator-initial-mode = <1>;
1088994 		regulator-ramp-delay = <2300>;
1089995 		fcs,suspend-voltage-selector = <1>;
1090996 		regulator-boot-on;
....@@ -1246,8 +1152,8 @@
12461152 			vccio_acodec: LDO_REG4 {
12471153 				regulator-always-on;
12481154 				regulator-boot-on;
1249
-				regulator-min-microvolt = <3300000>;
1250
-				regulator-max-microvolt = <3300000>;
1155
+				regulator-min-microvolt = <3000000>;
1156
+				regulator-max-microvolt = <3000000>;
12511157 				regulator-name = "vccio_acodec";
12521158 				regulator-state-mem {
12531159 					regulator-off-in-suspend;
....@@ -1361,15 +1267,6 @@
13611267 
13621268 &i2c1 {
13631269 	status = "okay";
1364
-
1365
-	gt1x: gt1x@14 {
1366
-		compatible = "goodix,gt1x";
1367
-		reg = <0x14>;
1368
-		pinctrl-names = "default";
1369
-		pinctrl-0 = <&touch_gpio>;
1370
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1371
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1372
-	};
13731270 };
13741271 
13751272 &i2c5 {
....@@ -1402,6 +1299,11 @@
14021299 		     &i2s1m0_lrcktx
14031300 		     &i2s1m0_sdi0
14041301 		     &i2s1m0_sdo0>;
1302
+};
1303
+
1304
+&i2s3_2ch {
1305
+	rockchip,bclk-fs = <32>;
1306
+	status = "disabled";
14051307 };
14061308 
14071309 &iep {
....@@ -1440,6 +1342,7 @@
14401342 
14411343 &pinctrl {
14421344 
1345
+
14431346 	mxc6655xa {
14441347 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
14451348 			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
....@@ -1454,12 +1357,12 @@
14541357 
14551358 		soc_slppin_gpio: soc_slppin_gpio {
14561359 			rockchip,pins =
1457
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1360
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
14581361 		};
14591362 
14601363 		soc_slppin_slp: soc_slppin_slp {
14611364 			rockchip,pins =
1462
-				<0 RK_PA2 1 &pcfg_pull_up>;
1365
+				<0 RK_PA2 1 &pcfg_pull_none>;
14631366 		};
14641367 
14651368 		soc_slppin_rst: soc_slppin_rst {
....@@ -1531,12 +1434,16 @@
15311434 	status = "okay";
15321435 };
15331436 
1437
+&pwm6 {
1438
+	status = "okay";
1439
+};
1440
+
15341441 &pwm5 {
15351442 	status = "okay";
15361443 };
15371444 
15381445 &pwm7 {
1539
-	status = "okay";
1446
+	status = "disabled";
15401447 
15411448 	compatible = "rockchip,remotectl-pwm";
15421449 	remote_pwm_id = <3>;
....@@ -1670,7 +1577,10 @@
16701577 	status = "okay";
16711578 };
16721579 
1673
-
1580
+&route_hdmi {
1581
+	status = "okay";
1582
+	connect = <&vp0_out_hdmi>;
1583
+};
16741584 
16751585 &saradc {
16761586 	status = "okay";
....@@ -1679,15 +1589,18 @@
16791589 
16801590 &sdhci {
16811591 	bus-width = <8>;
1682
-	supports-emmc;
1592
+	no-sdio;
1593
+	no-sd;
16831594 	non-removable;
16841595 	max-frequency = <200000000>;
1596
+	full-pwr-cycle-in-suspend;
16851597 	status = "okay";
16861598 };
16871599 
16881600 &sdmmc0 {
16891601 	max-frequency = <150000000>;
1690
-	supports-sd;
1602
+	no-sdio;
1603
+	no-mmc;
16911604 	bus-width = <4>;
16921605 	cap-mmc-highspeed;
16931606 	cap-sd-highspeed;
....@@ -1705,7 +1618,7 @@
17051618 };
17061619 
17071620 &spdif_8ch {
1708
-	status = "okay";
1621
+	status = "disabled";
17091622 };
17101623 
17111624 &tsadc {
....@@ -1767,15 +1680,6 @@
17671680 };
17681681 
17691682 &usbhost_dwc3 {
1770
-//	phys = <&u2phy0_host>;
1771
-//	phy-names = "usb2-phy";
1772
-//	maximum-speed = "high-speed";
1773
-//	snps,dis_u2_susphy_quirk;
1774
-	status = "okay";
1775
-};
1776
-
1777
-&combphy1_usq {
1778
-//	rockchip,dis-u3otg1-port;
17791683 	status = "okay";
17801684 };
17811685 
....@@ -1808,8 +1712,8 @@
18081712 
18091713 &vop {
18101714 	status = "okay";
1811
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1812
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1715
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1716
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
18131717 };
18141718 
18151719 &vop_mmu {