enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -103,7 +103,7 @@
103
103
 
104
104
 	backlight1: backlight1 {
105
105
 		compatible = "pwm-backlight";
106
-		pwms = <&pwm5 0 25000 0>;
106
+		pwms = <&pwm6 0 25000 0>;
107
107
 		brightness-levels = <
108
108
 			  0  20  20  21  21  22  22  23
109
109
 			 23  24  24  25  25  26  26  27
..
..
@@ -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
 		};
..
..
@@ -273,6 +299,8 @@
273
299
 	vcc5v0_otg: vcc5v0-otg-regulator {
274
300
 		compatible = "regulator-fixed";
275
301
 		regulator-name = "vcc5v0_otg";
302
+		egulator-boot-on;
303
+		regulator-always-on;
276
304
 		regulator-min-microvolt = <5000000>;
277
305
 		regulator-max-microvolt = <5000000>;
278
306
 		enable-active-high;
..
..
@@ -289,7 +317,7 @@
289
317
 		regulator-min-microvolt = <3300000>;
290
318
 		regulator-max-microvolt = <3300000>;
291
319
 		enable-active-high;
292
-		gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
320
+		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
293
321
 		vin-supply = <&vcc3v3_sys>;
294
322
 
295
323
 		regulator-state-mem {
..
..
@@ -362,30 +390,6 @@
362
390
 	status = "okay";
363
391
 };
364
392
 
365
-&can0 {
366
-	assigned-clocks = <&cru CLK_CAN0>;
367
-	assigned-clock-rates = <150000000>;
368
-	pinctrl-names = "default";
369
-	pinctrl-0 = <&can0m1_pins>;
370
-	status = "disabled";
371
-};
372
-
373
-&can1 {
374
-	assigned-clocks = <&cru CLK_CAN1>;
375
-	assigned-clock-rates = <150000000>;
376
-	pinctrl-names = "default";
377
-	pinctrl-0 = <&can1m1_pins>;
378
-	status = "disabled";
379
-};
380
-
381
-&can2 {
382
-	assigned-clocks = <&cru CLK_CAN2>;
383
-	assigned-clock-rates = <150000000>;
384
-	pinctrl-names = "default";
385
-	pinctrl-0 = <&can2m1_pins>;
386
-	status = "disabled";
387
-};
388
-
389
393
 &cpu0 {
390
394
 	cpu-supply = <&vdd_cpu>;
391
395
 };
..
..
@@ -417,267 +421,198 @@
417
421
 		dsi,format = <MIPI_DSI_FMT_RGB888>;
418
422
 		dsi,lanes  = <4>;
419
423
 		panel-init-sequence = [
420
-			23 00 02 FE 21
421
-			23 00 02 04 00
422
-			23 00 02 00 64
423
-			23 00 02 2A 00
424
-			23 00 02 26 64
425
-			23 00 02 54 00
426
-			23 00 02 50 64
427
-			23 00 02 7B 00
428
-			23 00 02 77 64
429
-			23 00 02 A2 00
430
-			23 00 02 9D 64
431
-			23 00 02 C9 00
432
-			23 00 02 C5 64
433
-			23 00 02 01 71
434
-			23 00 02 27 71
435
-			23 00 02 51 71
436
-			23 00 02 78 71
437
-			23 00 02 9E 71
438
-			23 00 02 C6 71
439
-			23 00 02 02 89
440
-			23 00 02 28 89
441
-			23 00 02 52 89
442
-			23 00 02 79 89
443
-			23 00 02 9F 89
444
-			23 00 02 C7 89
445
-			23 00 02 03 9E
446
-			23 00 02 29 9E
447
-			23 00 02 53 9E
448
-			23 00 02 7A 9E
449
-			23 00 02 A0 9E
450
-			23 00 02 C8 9E
451
-			23 00 02 09 00
452
-			23 00 02 05 B0
453
-			23 00 02 31 00
454
-			23 00 02 2B B0
455
-			23 00 02 5A 00
456
-			23 00 02 55 B0
457
-			23 00 02 80 00
458
-			23 00 02 7C B0
459
-			23 00 02 A7 00
460
-			23 00 02 A3 B0
461
-			23 00 02 CE 00
462
-			23 00 02 CA B0
463
-			23 00 02 06 C0
464
-			23 00 02 2D C0
465
-			23 00 02 56 C0
466
-			23 00 02 7D C0
467
-			23 00 02 A4 C0
468
-			23 00 02 CB C0
469
-			23 00 02 07 CF
470
-			23 00 02 2F CF
471
-			23 00 02 58 CF
472
-			23 00 02 7E CF
473
-			23 00 02 A5 CF
474
-			23 00 02 CC CF
475
-			23 00 02 08 DD
476
-			23 00 02 30 DD
477
-			23 00 02 59 DD
478
-			23 00 02 7F DD
479
-			23 00 02 A6 DD
480
-			23 00 02 CD DD
481
-			23 00 02 0E 15
482
-			23 00 02 0A E9
483
-			23 00 02 36 15
484
-			23 00 02 32 E9
485
-			23 00 02 5F 15
486
-			23 00 02 5B E9
487
-			23 00 02 85 15
488
-			23 00 02 81 E9
489
-			23 00 02 AD 15
490
-			23 00 02 A9 E9
491
-			23 00 02 D3 15
492
-			23 00 02 CF E9
493
-			23 00 02 0B 14
494
-			23 00 02 33 14
495
-			23 00 02 5C 14
496
-			23 00 02 82 14
497
-			23 00 02 AA 14
498
-			23 00 02 D0 14
499
-			23 00 02 0C 36
500
-			23 00 02 34 36
501
-			23 00 02 5D 36
502
-			23 00 02 83 36
503
-			23 00 02 AB 36
504
-			23 00 02 D1 36
505
-			23 00 02 0D 6B
506
-			23 00 02 35 6B
507
-			23 00 02 5E 6B
508
-			23 00 02 84 6B
509
-			23 00 02 AC 6B
510
-			23 00 02 D2 6B
511
-			23 00 02 13 5A
512
-			23 00 02 0F 94
513
-			23 00 02 3B 5A
514
-			23 00 02 37 94
515
-			23 00 02 64 5A
516
-			23 00 02 60 94
517
-			23 00 02 8A 5A
518
-			23 00 02 86 94
519
-			23 00 02 B2 5A
520
-			23 00 02 AE 94
521
-			23 00 02 D8 5A
522
-			23 00 02 D4 94
523
-			23 00 02 10 D1
524
-			23 00 02 38 D1
525
-			23 00 02 61 D1
526
-			23 00 02 87 D1
527
-			23 00 02 AF D1
528
-			23 00 02 D5 D1
529
-			23 00 02 11 04
530
-			23 00 02 39 04
531
-			23 00 02 62 04
532
-			23 00 02 88 04
533
-			23 00 02 B0 04
534
-			23 00 02 D6 04
535
-			23 00 02 12 05
536
-			23 00 02 3A 05
537
-			23 00 02 63 05
538
-			23 00 02 89 05
539
-			23 00 02 B1 05
540
-			23 00 02 D7 05
541
-			23 00 02 18 AA
542
-			23 00 02 14 36
543
-			23 00 02 42 AA
544
-			23 00 02 3D 36
545
-			23 00 02 69 AA
546
-			23 00 02 65 36
547
-			23 00 02 8F AA
548
-			23 00 02 8B 36
549
-			23 00 02 B7 AA
550
-			23 00 02 B3 36
551
-			23 00 02 DD AA
552
-			23 00 02 D9 36
553
-			23 00 02 15 74
554
-			23 00 02 3F 74
555
-			23 00 02 66 74
556
-			23 00 02 8C 74
557
-			23 00 02 B4 74
558
-			23 00 02 DA 74
559
-			23 00 02 16 9F
560
-			23 00 02 40 9F
561
-			23 00 02 67 9F
562
-			23 00 02 8D 9F
563
-			23 00 02 B5 9F
564
-			23 00 02 DB 9F
565
-			23 00 02 17 DC
566
-			23 00 02 41 DC
567
-			23 00 02 68 DC
568
-			23 00 02 8E DC
569
-			23 00 02 B6 DC
570
-			23 00 02 DC DC
571
-			23 00 02 1D FF
572
-			23 00 02 19 03
573
-			23 00 02 47 FF
574
-			23 00 02 43 03
575
-			23 00 02 6E FF
576
-			23 00 02 6A 03
577
-			23 00 02 94 FF
578
-			23 00 02 90 03
579
-			23 00 02 BC FF
580
-			23 00 02 B8 03
581
-			23 00 02 E2 FF
582
-			23 00 02 DE 03
583
-			23 00 02 1A 35
584
-			23 00 02 44 35
585
-			23 00 02 6B 35
586
-			23 00 02 91 35
587
-			23 00 02 B9 35
588
-			23 00 02 DF 35
589
-			23 00 02 1B 45
590
-			23 00 02 45 45
591
-			23 00 02 6C 45
592
-			23 00 02 92 45
593
-			23 00 02 BA 45
594
-			23 00 02 E0 45
595
-			23 00 02 1C 55
596
-			23 00 02 46 55
597
-			23 00 02 6D 55
598
-			23 00 02 93 55
599
-			23 00 02 BB 55
600
-			23 00 02 E1 55
601
-			23 00 02 22 FF
602
-			23 00 02 1E 68
603
-			23 00 02 4C FF
604
-			23 00 02 48 68
605
-			23 00 02 73 FF
606
-			23 00 02 6F 68
607
-			23 00 02 99 FF
608
-			23 00 02 95 68
609
-			23 00 02 C1 FF
610
-			23 00 02 BD 68
611
-			23 00 02 E7 FF
612
-			23 00 02 E3 68
613
-			23 00 02 1F 7E
614
-			23 00 02 49 7E
615
-			23 00 02 70 7E
616
-			23 00 02 96 7E
617
-			23 00 02 BE 7E
618
-			23 00 02 E4 7E
619
-			23 00 02 20 97
620
-			23 00 02 4A 97
621
-			23 00 02 71 97
622
-			23 00 02 97 97
623
-			23 00 02 BF 97
624
-			23 00 02 E5 97
625
-			23 00 02 21 B5
626
-			23 00 02 4B B5
627
-			23 00 02 72 B5
628
-			23 00 02 98 B5
629
-			23 00 02 C0 B5
630
-			23 00 02 E6 B5
631
-			23 00 02 25 F0
632
-			23 00 02 23 E8
633
-			23 00 02 4F F0
634
-			23 00 02 4D E8
635
-			23 00 02 76 F0
636
-			23 00 02 74 E8
637
-			23 00 02 9C F0
638
-			23 00 02 9A E8
639
-			23 00 02 C4 F0
640
-			23 00 02 C2 E8
641
-			23 00 02 EA F0
642
-			23 00 02 E8 E8
643
-			23 00 02 24 FF
644
-			23 00 02 4E FF
645
-			23 00 02 75 FF
646
-			23 00 02 9B FF
647
-			23 00 02 C3 FF
648
-			23 00 02 E9 FF
649
-			23 00 02 FE 3D
650
-			23 00 02 00 04
651
-			23 00 02 FE 23
652
-			23 00 02 08 82
653
-			23 00 02 0A 00
654
-			23 00 02 0B 00
655
-			23 00 02 0C 01
656
-			23 00 02 16 00
657
-			23 00 02 18 02
658
-			23 00 02 1B 04
659
-			23 00 02 19 04
660
-			23 00 02 1C 81
661
-			23 00 02 1F 00
662
-			23 00 02 20 03
663
-			23 00 02 23 04
664
-			23 00 02 21 01
665
-			23 00 02 54 63
666
-			23 00 02 55 54
667
-			23 00 02 6E 45
668
-			23 00 02 6D 36
669
-			23 00 02 FE 3D
670
-			23 00 02 55 78
671
-			23 00 02 FE 20
672
-			23 00 02 26 30
673
-			23 00 02 FE 3D
674
-			23 00 02 20 71
675
-			23 00 02 50 8F
676
-			23 00 02 51 8F
677
-			23 00 02 FE 00
678
-			23 00 02 35 00
679
-			05 78 01 11
680
-			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
681
616
 		];
682
617
 
683
618
 		panel-exit-sequence = [
..
..
@@ -738,303 +673,242 @@
738
673
 		status = "okay";
739
674
 		compatible = "simple-panel-dsi";
740
675
 		reg = <0>;
741
-		backlight = <&backlight1>;
742
-		reset-delay-ms = <60>;
743
-		enable-delay-ms = <60>;
744
-		prepare-delay-ms = <60>;
745
-		unprepare-delay-ms = <60>;
746
-		disable-delay-ms = <60>;
747
-		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
748
-			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
749
-		dsi,format = <MIPI_DSI_FMT_RGB888>;
750
-		dsi,lanes  = <4>;
751
-		panel-init-sequence = [
752
-			23 00 02 FE 21
753
-			23 00 02 04 00
754
-			23 00 02 00 64
755
-			23 00 02 2A 00
756
-			23 00 02 26 64
757
-			23 00 02 54 00
758
-			23 00 02 50 64
759
-			23 00 02 7B 00
760
-			23 00 02 77 64
761
-			23 00 02 A2 00
762
-			23 00 02 9D 64
763
-			23 00 02 C9 00
764
-			23 00 02 C5 64
765
-			23 00 02 01 71
766
-			23 00 02 27 71
767
-			23 00 02 51 71
768
-			23 00 02 78 71
769
-			23 00 02 9E 71
770
-			23 00 02 C6 71
771
-			23 00 02 02 89
772
-			23 00 02 28 89
773
-			23 00 02 52 89
774
-			23 00 02 79 89
775
-			23 00 02 9F 89
776
-			23 00 02 C7 89
777
-			23 00 02 03 9E
778
-			23 00 02 29 9E
779
-			23 00 02 53 9E
780
-			23 00 02 7A 9E
781
-			23 00 02 A0 9E
782
-			23 00 02 C8 9E
783
-			23 00 02 09 00
784
-			23 00 02 05 B0
785
-			23 00 02 31 00
786
-			23 00 02 2B B0
787
-			23 00 02 5A 00
788
-			23 00 02 55 B0
789
-			23 00 02 80 00
790
-			23 00 02 7C B0
791
-			23 00 02 A7 00
792
-			23 00 02 A3 B0
793
-			23 00 02 CE 00
794
-			23 00 02 CA B0
795
-			23 00 02 06 C0
796
-			23 00 02 2D C0
797
-			23 00 02 56 C0
798
-			23 00 02 7D C0
799
-			23 00 02 A4 C0
800
-			23 00 02 CB C0
801
-			23 00 02 07 CF
802
-			23 00 02 2F CF
803
-			23 00 02 58 CF
804
-			23 00 02 7E CF
805
-			23 00 02 A5 CF
806
-			23 00 02 CC CF
807
-			23 00 02 08 DD
808
-			23 00 02 30 DD
809
-			23 00 02 59 DD
810
-			23 00 02 7F DD
811
-			23 00 02 A6 DD
812
-			23 00 02 CD DD
813
-			23 00 02 0E 15
814
-			23 00 02 0A E9
815
-			23 00 02 36 15
816
-			23 00 02 32 E9
817
-			23 00 02 5F 15
818
-			23 00 02 5B E9
819
-			23 00 02 85 15
820
-			23 00 02 81 E9
821
-			23 00 02 AD 15
822
-			23 00 02 A9 E9
823
-			23 00 02 D3 15
824
-			23 00 02 CF E9
825
-			23 00 02 0B 14
826
-			23 00 02 33 14
827
-			23 00 02 5C 14
828
-			23 00 02 82 14
829
-			23 00 02 AA 14
830
-			23 00 02 D0 14
831
-			23 00 02 0C 36
832
-			23 00 02 34 36
833
-			23 00 02 5D 36
834
-			23 00 02 83 36
835
-			23 00 02 AB 36
836
-			23 00 02 D1 36
837
-			23 00 02 0D 6B
838
-			23 00 02 35 6B
839
-			23 00 02 5E 6B
840
-			23 00 02 84 6B
841
-			23 00 02 AC 6B
842
-			23 00 02 D2 6B
843
-			23 00 02 13 5A
844
-			23 00 02 0F 94
845
-			23 00 02 3B 5A
846
-			23 00 02 37 94
847
-			23 00 02 64 5A
848
-			23 00 02 60 94
849
-			23 00 02 8A 5A
850
-			23 00 02 86 94
851
-			23 00 02 B2 5A
852
-			23 00 02 AE 94
853
-			23 00 02 D8 5A
854
-			23 00 02 D4 94
855
-			23 00 02 10 D1
856
-			23 00 02 38 D1
857
-			23 00 02 61 D1
858
-			23 00 02 87 D1
859
-			23 00 02 AF D1
860
-			23 00 02 D5 D1
861
-			23 00 02 11 04
862
-			23 00 02 39 04
863
-			23 00 02 62 04
864
-			23 00 02 88 04
865
-			23 00 02 B0 04
866
-			23 00 02 D6 04
867
-			23 00 02 12 05
868
-			23 00 02 3A 05
869
-			23 00 02 63 05
870
-			23 00 02 89 05
871
-			23 00 02 B1 05
872
-			23 00 02 D7 05
873
-			23 00 02 18 AA
874
-			23 00 02 14 36
875
-			23 00 02 42 AA
876
-			23 00 02 3D 36
877
-			23 00 02 69 AA
878
-			23 00 02 65 36
879
-			23 00 02 8F AA
880
-			23 00 02 8B 36
881
-			23 00 02 B7 AA
882
-			23 00 02 B3 36
883
-			23 00 02 DD AA
884
-			23 00 02 D9 36
885
-			23 00 02 15 74
886
-			23 00 02 3F 74
887
-			23 00 02 66 74
888
-			23 00 02 8C 74
889
-			23 00 02 B4 74
890
-			23 00 02 DA 74
891
-			23 00 02 16 9F
892
-			23 00 02 40 9F
893
-			23 00 02 67 9F
894
-			23 00 02 8D 9F
895
-			23 00 02 B5 9F
896
-			23 00 02 DB 9F
897
-			23 00 02 17 DC
898
-			23 00 02 41 DC
899
-			23 00 02 68 DC
900
-			23 00 02 8E DC
901
-			23 00 02 B6 DC
902
-			23 00 02 DC DC
903
-			23 00 02 1D FF
904
-			23 00 02 19 03
905
-			23 00 02 47 FF
906
-			23 00 02 43 03
907
-			23 00 02 6E FF
908
-			23 00 02 6A 03
909
-			23 00 02 94 FF
910
-			23 00 02 90 03
911
-			23 00 02 BC FF
912
-			23 00 02 B8 03
913
-			23 00 02 E2 FF
914
-			23 00 02 DE 03
915
-			23 00 02 1A 35
916
-			23 00 02 44 35
917
-			23 00 02 6B 35
918
-			23 00 02 91 35
919
-			23 00 02 B9 35
920
-			23 00 02 DF 35
921
-			23 00 02 1B 45
922
-			23 00 02 45 45
923
-			23 00 02 6C 45
924
-			23 00 02 92 45
925
-			23 00 02 BA 45
926
-			23 00 02 E0 45
927
-			23 00 02 1C 55
928
-			23 00 02 46 55
929
-			23 00 02 6D 55
930
-			23 00 02 93 55
931
-			23 00 02 BB 55
932
-			23 00 02 E1 55
933
-			23 00 02 22 FF
934
-			23 00 02 1E 68
935
-			23 00 02 4C FF
936
-			23 00 02 48 68
937
-			23 00 02 73 FF
938
-			23 00 02 6F 68
939
-			23 00 02 99 FF
940
-			23 00 02 95 68
941
-			23 00 02 C1 FF
942
-			23 00 02 BD 68
943
-			23 00 02 E7 FF
944
-			23 00 02 E3 68
945
-			23 00 02 1F 7E
946
-			23 00 02 49 7E
947
-			23 00 02 70 7E
948
-			23 00 02 96 7E
949
-			23 00 02 BE 7E
950
-			23 00 02 E4 7E
951
-			23 00 02 20 97
952
-			23 00 02 4A 97
953
-			23 00 02 71 97
954
-			23 00 02 97 97
955
-			23 00 02 BF 97
956
-			23 00 02 E5 97
957
-			23 00 02 21 B5
958
-			23 00 02 4B B5
959
-			23 00 02 72 B5
960
-			23 00 02 98 B5
961
-			23 00 02 C0 B5
962
-			23 00 02 E6 B5
963
-			23 00 02 25 F0
964
-			23 00 02 23 E8
965
-			23 00 02 4F F0
966
-			23 00 02 4D E8
967
-			23 00 02 76 F0
968
-			23 00 02 74 E8
969
-			23 00 02 9C F0
970
-			23 00 02 9A E8
971
-			23 00 02 C4 F0
972
-			23 00 02 C2 E8
973
-			23 00 02 EA F0
974
-			23 00 02 E8 E8
975
-			23 00 02 24 FF
976
-			23 00 02 4E FF
977
-			23 00 02 75 FF
978
-			23 00 02 9B FF
979
-			23 00 02 C3 FF
980
-			23 00 02 E9 FF
981
-			23 00 02 FE 3D
982
-			23 00 02 00 04
983
-			23 00 02 FE 23
984
-			23 00 02 08 82
985
-			23 00 02 0A 00
986
-			23 00 02 0B 00
987
-			23 00 02 0C 01
988
-			23 00 02 16 00
989
-			23 00 02 18 02
990
-			23 00 02 1B 04
991
-			23 00 02 19 04
992
-			23 00 02 1C 81
993
-			23 00 02 1F 00
994
-			23 00 02 20 03
995
-			23 00 02 23 04
996
-			23 00 02 21 01
997
-			23 00 02 54 63
998
-			23 00 02 55 54
999
-			23 00 02 6E 45
1000
-			23 00 02 6D 36
1001
-			23 00 02 FE 3D
1002
-			23 00 02 55 78
1003
-			23 00 02 FE 20
1004
-			23 00 02 26 30
1005
-			23 00 02 FE 3D
1006
-			23 00 02 20 71
1007
-			23 00 02 50 8F
1008
-			23 00 02 51 8F
1009
-			23 00 02 FE 00
1010
-			23 00 02 35 00
1011
-			05 78 01 11
1012
-			05 1E 01 29
1013
-		];
676
+		power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
677
+		vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
678
+		reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
679
+		vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
680
+		reset-delay-ms = <200>;
681
+        enable-delay-ms = <60>;
682
+        init-delay-ms = <120>;
683
+        disable-delay-ms = <60>;
684
+        prepare-delay-ms = <120>;
685
+        unprepare-delay-ms = <120>;
686
+        backlight = <&backlight1>;
687
+        dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
688
+                MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
689
+        dsi,format = <MIPI_DSI_FMT_RGB888>;
690
+        dsi,lanes  = <4>;
691
+
692
+        panel-init-sequence = [
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 
887
+        ];
1014
888
 
1015
889
 		panel-exit-sequence = [
1016
890
 			05 00 01 28
1017
891
 			05 00 01 10
1018
892
 		];
1019
893
 
1020
-		disp_timings1: display-timings {
1021
-			native-mode = <&dsi1_timing0>;
1022
-			dsi1_timing0: timing0 {
1023
-				clock-frequency = <132000000>;
1024
-				hactive = <1080>;
1025
-				vactive = <1920>;
1026
-				hfront-porch = <15>;
1027
-				hsync-len = <2>;
1028
-				hback-porch = <30>;
1029
-				vfront-porch = <15>;
1030
-				vsync-len = <2>;
1031
-				vback-porch = <15>;
1032
-				hsync-active = <0>;
1033
-				vsync-active = <0>;
1034
-				de-active = <0>;
1035
-				pixelclk-active = <1>;
1036
-			};
1037
-		};
894
+         disp_timings1: display-timings {
895
+                                        native-mode = <&dsi1_timing0>;
896
+                                        dsi1_timing0: timing0 {
897
+                                        clock-frequency = <69000000>;
898
+                                        hactive = <800>;
899
+                                        vactive = <1280>;
900
+                                        hfront-porch = <32>;
901
+                                        hsync-len = <20>;
902
+                                        hback-porch = <20>;
903
+                                        vfront-porch = <16>;
904
+                                        vsync-len = <5>;
905
+                                        vback-porch = <12>;
906
+                                        hsync-active = <0>;
907
+                                        vsync-active = <0>;
908
+                                        de-active = <0>;
909
+                                        pixelclk-active = <1>;
910
+                                };
911
+                        };
1038
912
 
1039
913
 		ports {
1040
914
 			#address-cells = <1>;
..
..
@@ -1095,7 +969,7 @@
1095
969
 	status = "okay";
1096
970
 
1097
971
 	vdd_cpu: tcs4525@1c {
1098
-		compatible = "tcs,tcs452x";
972
+		compatible = "tcs,tcs4525";
1099
973
 		reg = <0x1c>;
1100
974
 		vin-supply = <&vcc5v0_sys>;
1101
975
 		regulator-compatible = "fan53555-reg";
..
..
@@ -1103,7 +977,6 @@
1103
977
 		regulator-min-microvolt = <712500>;
1104
978
 		regulator-max-microvolt = <1390000>;
1105
979
 		regulator-init-microvolt = <900000>;
1106
-		regulator-initial-mode = <1>;
1107
980
 		regulator-ramp-delay = <2300>;
1108
981
 		fcs,suspend-voltage-selector = <1>;
1109
982
 		regulator-boot-on;
..
..
@@ -1265,8 +1138,8 @@
1265
1138
 			vccio_acodec: LDO_REG4 {
1266
1139
 				regulator-always-on;
1267
1140
 				regulator-boot-on;
1268
-				regulator-min-microvolt = <3300000>;
1269
-				regulator-max-microvolt = <3300000>;
1141
+				regulator-min-microvolt = <3000000>;
1142
+				regulator-max-microvolt = <3000000>;
1270
1143
 				regulator-name = "vccio_acodec";
1271
1144
 				regulator-state-mem {
1272
1145
 					regulator-off-in-suspend;
..
..
@@ -1361,7 +1234,7 @@
1361
1234
 		};
1362
1235
 
1363
1236
 		rk809_codec: codec {
1364
-			#sound-dai-cells = <0>;
1237
+			#sound-dai-cells = <1>;
1365
1238
 			compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
1366
1239
 			clocks = <&cru I2S1_MCLKOUT>;
1367
1240
 			clock-names = "mclk";
..
..
@@ -1380,15 +1253,6 @@
1380
1253
 
1381
1254
 &i2c1 {
1382
1255
 	status = "okay";
1383
-
1384
-	gt1x: gt1x@14 {
1385
-		compatible = "goodix,gt1x";
1386
-		reg = <0x14>;
1387
-		pinctrl-names = "default";
1388
-		pinctrl-0 = <&touch_gpio>;
1389
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1390
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1391
-	};
1392
1256
 };
1393
1257
 
1394
1258
 &i2c5 {
..
..
@@ -1421,6 +1285,12 @@
1421
1285
 		     &i2s1m0_lrcktx
1422
1286
 		     &i2s1m0_sdi0
1423
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";
1424
1294
 };
1425
1295
 
1426
1296
 &iep {
..
..
@@ -1459,6 +1329,12 @@
1459
1329
 
1460
1330
 &pinctrl {
1461
1331
 
1332
+	headphone {
1333
+		hp_det: hp-det {
1334
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
+		};
1336
+	};
1337
+
1462
1338
 	mxc6655xa {
1463
1339
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
1464
1340
 			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
..
..
@@ -1473,12 +1349,12 @@
1473
1349
 
1474
1350
 		soc_slppin_gpio: soc_slppin_gpio {
1475
1351
 			rockchip,pins =
1476
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1352
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
1477
1353
 		};
1478
1354
 
1479
1355
 		soc_slppin_slp: soc_slppin_slp {
1480
1356
 			rockchip,pins =
1481
-				<0 RK_PA2 1 &pcfg_pull_up>;
1357
+				<0 RK_PA2 1 &pcfg_pull_none>;
1482
1358
 		};
1483
1359
 
1484
1360
 		soc_slppin_rst: soc_slppin_rst {
..
..
@@ -1547,6 +1423,10 @@
1547
1423
 };
1548
1424
 
1549
1425
 &pwm4 {
1426
+	status = "okay";
1427
+};
1428
+
1429
+&pwm6 {
1550
1430
 	status = "okay";
1551
1431
 };
1552
1432
 
..
..
@@ -1701,15 +1581,18 @@
1701
1581
 
1702
1582
 &sdhci {
1703
1583
 	bus-width = <8>;
1704
-	supports-emmc;
1584
+	no-sdio;
1585
+	no-sd;
1705
1586
 	non-removable;
1706
1587
 	max-frequency = <200000000>;
1588
+	full-pwr-cycle-in-suspend;
1707
1589
 	status = "okay";
1708
1590
 };
1709
1591
 
1710
1592
 &sdmmc0 {
1711
1593
 	max-frequency = <150000000>;
1712
-	supports-sd;
1594
+	no-sdio;
1595
+	no-mmc;
1713
1596
 	bus-width = <4>;
1714
1597
 	cap-mmc-highspeed;
1715
1598
 	cap-sd-highspeed;
..
..
@@ -1789,15 +1672,6 @@
1789
1672
 };
1790
1673
 
1791
1674
 &usbhost_dwc3 {
1792
-	phys = <&u2phy0_host>;
1793
-	phy-names = "usb2-phy";
1794
-	maximum-speed = "high-speed";
1795
-	snps,dis_u2_susphy_quirk;
1796
-	status = "okay";
1797
-};
1798
-
1799
-&combphy1_usq {
1800
-	rockchip,dis-u3otg1-port;
1801
1675
 	status = "okay";
1802
1676
 };
1803
1677
 
..
..
@@ -1830,8 +1704,8 @@
1830
1704
 
1831
1705
 &vop {
1832
1706
 	status = "okay";
1833
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1834
-	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>;
1835
1709
 };
1836
1710
 
1837
1711
 &vop_mmu {