change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
old mode 100644new mode 100755
..
..
@@ -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
..
..
@@ -172,18 +172,24 @@
172
172
 	};
173
173
 
174
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";
175
179
 		status = "disabled";
176
-		compatible = "rockchip,hdmi";
177
-		rockchip,mclk-fs = <128>;
178
-		rockchip,card-name = "rockchip,hdmi";
179
-		rockchip,cpu = <&i2s0_8ch>;
180
-		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
+		};
181
187
 	};
182
188
 
183
189
 	leds: leds {
184
190
 		compatible = "gpio-leds";
185
-		work_led: work {
186
-			gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
191
+		sys_led: sys_led {
192
+			gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
187
193
 			linux,default-trigger = "heartbeat";
188
194
 		};
189
195
 	};
..
..
@@ -208,15 +214,17 @@
208
214
 
209
215
 	rk809_sound: rk809-sound {
210
216
 		status = "okay";
211
-		compatible = "rockchip,multicodecs-card";
212
-		rockchip,card-name = "rockchip-rk809";
213
-		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
214
-		rockchip,format = "i2s";
215
-		rockchip,mclk-fs = <256>;
216
-		rockchip,cpu = <&i2s1_8ch>;
217
-		rockchip,codec = <&rk809_codec>;
218
-		pinctrl-names = "default";
219
-		pinctrl-0 = <&hp_det>;
217
+		compatible = "simple-audio-card";
218
+		simple-audio-card,format = "i2s";
219
+		simple-audio-card,name = "rockchip,rk809-codec";
220
+		simple-audio-card,mclk-fs = <256>;
221
+
222
+		simple-audio-card,cpu {
223
+			sound-dai = <&i2s1_8ch>;
224
+		};
225
+		simple-audio-card,codec {
226
+			sound-dai = <&rk809_codec>;
227
+		};
220
228
 	};
221
229
 
222
230
 	spdif-sound {
..
..
@@ -292,6 +300,8 @@
292
300
 	vcc5v0_otg: vcc5v0-otg-regulator {
293
301
 		compatible = "regulator-fixed";
294
302
 		regulator-name = "vcc5v0_otg";
303
+		egulator-boot-on;
304
+		regulator-always-on;
295
305
 		regulator-min-microvolt = <5000000>;
296
306
 		regulator-max-microvolt = <5000000>;
297
307
 		enable-active-high;
..
..
@@ -308,7 +318,7 @@
308
318
 		regulator-min-microvolt = <3300000>;
309
319
 		regulator-max-microvolt = <3300000>;
310
320
 		enable-active-high;
311
-		gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
321
+		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
312
322
 		vin-supply = <&vcc3v3_sys>;
313
323
 
314
324
 		regulator-state-mem {
..
..
@@ -345,13 +355,15 @@
345
355
 		 * - PDN (power down when low)
346
356
 		 */
347
357
 		post-power-on-delay-ms = <200>;
348
-		reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
358
+		reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
349
359
 	};
350
360
 
351
361
 	wireless_wlan: wireless-wlan {
352
362
 		compatible = "wlan-platdata";
353
363
 		rockchip,grf = <&grf>;
354
364
 		wifi_chip_type = "ap6398s";
365
+		clocks = <&rk809 1>;
366
+		clock-names = "ext_clock";
355
367
 		status = "okay";
356
368
 	};
357
369
 
..
..
@@ -381,30 +393,6 @@
381
393
 	status = "okay";
382
394
 };
383
395
 
384
-&can0 {
385
-	assigned-clocks = <&cru CLK_CAN0>;
386
-	assigned-clock-rates = <150000000>;
387
-	pinctrl-names = "default";
388
-	pinctrl-0 = <&can0m1_pins>;
389
-	status = "disabled";
390
-};
391
-
392
-&can1 {
393
-	assigned-clocks = <&cru CLK_CAN1>;
394
-	assigned-clock-rates = <150000000>;
395
-	pinctrl-names = "default";
396
-	pinctrl-0 = <&can1m1_pins>;
397
-	status = "disabled";
398
-};
399
-
400
-&can2 {
401
-	assigned-clocks = <&cru CLK_CAN2>;
402
-	assigned-clock-rates = <150000000>;
403
-	pinctrl-names = "default";
404
-	pinctrl-0 = <&can2m1_pins>;
405
-	status = "disabled";
406
-};
407
-
408
396
 &cpu0 {
409
397
 	cpu-supply = <&vdd_cpu>;
410
398
 };
..
..
@@ -412,6 +400,7 @@
412
400
 &dfi {
413
401
 	status = "okay";
414
402
 };
403
+
415
404
 
416
405
 &dmc {
417
406
 	center-supply = <&vdd_logic>;
..
..
@@ -436,267 +425,198 @@
436
425
 		dsi,format = <MIPI_DSI_FMT_RGB888>;
437
426
 		dsi,lanes  = <4>;
438
427
 		panel-init-sequence = [
439
-			23 00 02 FE 21
440
-			23 00 02 04 00
441
-			23 00 02 00 64
442
-			23 00 02 2A 00
443
-			23 00 02 26 64
444
-			23 00 02 54 00
445
-			23 00 02 50 64
446
-			23 00 02 7B 00
447
-			23 00 02 77 64
448
-			23 00 02 A2 00
449
-			23 00 02 9D 64
450
-			23 00 02 C9 00
451
-			23 00 02 C5 64
452
-			23 00 02 01 71
453
-			23 00 02 27 71
454
-			23 00 02 51 71
455
-			23 00 02 78 71
456
-			23 00 02 9E 71
457
-			23 00 02 C6 71
458
-			23 00 02 02 89
459
-			23 00 02 28 89
460
-			23 00 02 52 89
461
-			23 00 02 79 89
462
-			23 00 02 9F 89
463
-			23 00 02 C7 89
464
-			23 00 02 03 9E
465
-			23 00 02 29 9E
466
-			23 00 02 53 9E
467
-			23 00 02 7A 9E
468
-			23 00 02 A0 9E
469
-			23 00 02 C8 9E
470
-			23 00 02 09 00
471
-			23 00 02 05 B0
472
-			23 00 02 31 00
473
-			23 00 02 2B B0
474
-			23 00 02 5A 00
475
-			23 00 02 55 B0
476
-			23 00 02 80 00
477
-			23 00 02 7C B0
478
-			23 00 02 A7 00
479
-			23 00 02 A3 B0
480
-			23 00 02 CE 00
481
-			23 00 02 CA B0
482
-			23 00 02 06 C0
483
-			23 00 02 2D C0
484
-			23 00 02 56 C0
485
-			23 00 02 7D C0
486
-			23 00 02 A4 C0
487
-			23 00 02 CB C0
488
-			23 00 02 07 CF
489
-			23 00 02 2F CF
490
-			23 00 02 58 CF
491
-			23 00 02 7E CF
492
-			23 00 02 A5 CF
493
-			23 00 02 CC CF
494
-			23 00 02 08 DD
495
-			23 00 02 30 DD
496
-			23 00 02 59 DD
497
-			23 00 02 7F DD
498
-			23 00 02 A6 DD
499
-			23 00 02 CD DD
500
-			23 00 02 0E 15
501
-			23 00 02 0A E9
502
-			23 00 02 36 15
503
-			23 00 02 32 E9
504
-			23 00 02 5F 15
505
-			23 00 02 5B E9
506
-			23 00 02 85 15
507
-			23 00 02 81 E9
508
-			23 00 02 AD 15
509
-			23 00 02 A9 E9
510
-			23 00 02 D3 15
511
-			23 00 02 CF E9
512
-			23 00 02 0B 14
513
-			23 00 02 33 14
514
-			23 00 02 5C 14
515
-			23 00 02 82 14
516
-			23 00 02 AA 14
517
-			23 00 02 D0 14
518
-			23 00 02 0C 36
519
-			23 00 02 34 36
520
-			23 00 02 5D 36
521
-			23 00 02 83 36
522
-			23 00 02 AB 36
523
-			23 00 02 D1 36
524
-			23 00 02 0D 6B
525
-			23 00 02 35 6B
526
-			23 00 02 5E 6B
527
-			23 00 02 84 6B
528
-			23 00 02 AC 6B
529
-			23 00 02 D2 6B
530
-			23 00 02 13 5A
531
-			23 00 02 0F 94
532
-			23 00 02 3B 5A
533
-			23 00 02 37 94
534
-			23 00 02 64 5A
535
-			23 00 02 60 94
536
-			23 00 02 8A 5A
537
-			23 00 02 86 94
538
-			23 00 02 B2 5A
539
-			23 00 02 AE 94
540
-			23 00 02 D8 5A
541
-			23 00 02 D4 94
542
-			23 00 02 10 D1
543
-			23 00 02 38 D1
544
-			23 00 02 61 D1
545
-			23 00 02 87 D1
546
-			23 00 02 AF D1
547
-			23 00 02 D5 D1
548
-			23 00 02 11 04
549
-			23 00 02 39 04
550
-			23 00 02 62 04
551
-			23 00 02 88 04
552
-			23 00 02 B0 04
553
-			23 00 02 D6 04
554
-			23 00 02 12 05
555
-			23 00 02 3A 05
556
-			23 00 02 63 05
557
-			23 00 02 89 05
558
-			23 00 02 B1 05
559
-			23 00 02 D7 05
560
-			23 00 02 18 AA
561
-			23 00 02 14 36
562
-			23 00 02 42 AA
563
-			23 00 02 3D 36
564
-			23 00 02 69 AA
565
-			23 00 02 65 36
566
-			23 00 02 8F AA
567
-			23 00 02 8B 36
568
-			23 00 02 B7 AA
569
-			23 00 02 B3 36
570
-			23 00 02 DD AA
571
-			23 00 02 D9 36
572
-			23 00 02 15 74
573
-			23 00 02 3F 74
574
-			23 00 02 66 74
575
-			23 00 02 8C 74
576
-			23 00 02 B4 74
577
-			23 00 02 DA 74
578
-			23 00 02 16 9F
579
-			23 00 02 40 9F
580
-			23 00 02 67 9F
581
-			23 00 02 8D 9F
582
-			23 00 02 B5 9F
583
-			23 00 02 DB 9F
584
-			23 00 02 17 DC
585
-			23 00 02 41 DC
586
-			23 00 02 68 DC
587
-			23 00 02 8E DC
588
-			23 00 02 B6 DC
589
-			23 00 02 DC DC
590
-			23 00 02 1D FF
591
-			23 00 02 19 03
592
-			23 00 02 47 FF
593
-			23 00 02 43 03
594
-			23 00 02 6E FF
595
-			23 00 02 6A 03
596
-			23 00 02 94 FF
597
-			23 00 02 90 03
598
-			23 00 02 BC FF
599
-			23 00 02 B8 03
600
-			23 00 02 E2 FF
601
-			23 00 02 DE 03
602
-			23 00 02 1A 35
603
-			23 00 02 44 35
604
-			23 00 02 6B 35
605
-			23 00 02 91 35
606
-			23 00 02 B9 35
607
-			23 00 02 DF 35
608
-			23 00 02 1B 45
609
-			23 00 02 45 45
610
-			23 00 02 6C 45
611
-			23 00 02 92 45
612
-			23 00 02 BA 45
613
-			23 00 02 E0 45
614
-			23 00 02 1C 55
615
-			23 00 02 46 55
616
-			23 00 02 6D 55
617
-			23 00 02 93 55
618
-			23 00 02 BB 55
619
-			23 00 02 E1 55
620
-			23 00 02 22 FF
621
-			23 00 02 1E 68
622
-			23 00 02 4C FF
623
-			23 00 02 48 68
624
-			23 00 02 73 FF
625
-			23 00 02 6F 68
626
-			23 00 02 99 FF
627
-			23 00 02 95 68
628
-			23 00 02 C1 FF
629
-			23 00 02 BD 68
630
-			23 00 02 E7 FF
631
-			23 00 02 E3 68
632
-			23 00 02 1F 7E
633
-			23 00 02 49 7E
634
-			23 00 02 70 7E
635
-			23 00 02 96 7E
636
-			23 00 02 BE 7E
637
-			23 00 02 E4 7E
638
-			23 00 02 20 97
639
-			23 00 02 4A 97
640
-			23 00 02 71 97
641
-			23 00 02 97 97
642
-			23 00 02 BF 97
643
-			23 00 02 E5 97
644
-			23 00 02 21 B5
645
-			23 00 02 4B B5
646
-			23 00 02 72 B5
647
-			23 00 02 98 B5
648
-			23 00 02 C0 B5
649
-			23 00 02 E6 B5
650
-			23 00 02 25 F0
651
-			23 00 02 23 E8
652
-			23 00 02 4F F0
653
-			23 00 02 4D E8
654
-			23 00 02 76 F0
655
-			23 00 02 74 E8
656
-			23 00 02 9C F0
657
-			23 00 02 9A E8
658
-			23 00 02 C4 F0
659
-			23 00 02 C2 E8
660
-			23 00 02 EA F0
661
-			23 00 02 E8 E8
662
-			23 00 02 24 FF
663
-			23 00 02 4E FF
664
-			23 00 02 75 FF
665
-			23 00 02 9B FF
666
-			23 00 02 C3 FF
667
-			23 00 02 E9 FF
668
-			23 00 02 FE 3D
669
-			23 00 02 00 04
670
-			23 00 02 FE 23
671
-			23 00 02 08 82
672
-			23 00 02 0A 00
673
-			23 00 02 0B 00
674
-			23 00 02 0C 01
675
-			23 00 02 16 00
676
-			23 00 02 18 02
677
-			23 00 02 1B 04
678
-			23 00 02 19 04
679
-			23 00 02 1C 81
680
-			23 00 02 1F 00
681
-			23 00 02 20 03
682
-			23 00 02 23 04
683
-			23 00 02 21 01
684
-			23 00 02 54 63
685
-			23 00 02 55 54
686
-			23 00 02 6E 45
687
-			23 00 02 6D 36
688
-			23 00 02 FE 3D
689
-			23 00 02 55 78
690
-			23 00 02 FE 20
691
-			23 00 02 26 30
692
-			23 00 02 FE 3D
693
-			23 00 02 20 71
694
-			23 00 02 50 8F
695
-			23 00 02 51 8F
696
-			23 00 02 FE 00
697
-			23 00 02 35 00
698
-			05 78 01 11
699
-			05 1E 01 29
428
+			39 00 05 FF 03 98 81 03
429
+			39 00 03 01 01 00
430
+			39 00 03 02 01 00
431
+			39 00 03 03 01 53     
432
+			39 00 03 04 01 D3     
433
+			39 00 03 05 01 00     
434
+			39 00 03 06 01 0D     
435
+			39 00 03 07 01 08     
436
+			39 00 03 08 01 00     
437
+			39 00 03 09 01 00     
438
+			39 00 03 0a 01 00     
439
+			39 00 03 0b 01 00     
440
+			39 00 03 0c 01 00     
441
+			39 00 03 0d 01 00     
442
+			39 00 03 0e 01 00     
443
+			39 00 03 0f 01 28     
444
+			39 00 03 10 01 28     
445
+			39 00 03 11 01 00     
446
+			39 00 03 12 01 00     
447
+			39 00 03 13 01 00     
448
+			39 00 03 14 01 00     
449
+			39 00 03 15 01 00     
450
+			39 00 03 16 01 00     
451
+			39 00 03 17 01 00     
452
+			39 00 03 18 01 00     
453
+			39 00 03 19 01 00     
454
+			39 00 03 1a 01 00     
455
+			39 00 03 1b 01 00     
456
+			39 00 03 1c 01 00     
457
+			39 00 03 1d 01 00     
458
+			39 00 03 1e 01 40     
459
+			39 00 03 1f 01 80     
460
+			39 00 03 20 01 06     
461
+			39 00 03 21 01 01     
462
+			39 00 03 22 01 00     
463
+			39 00 03 23 01 00     
464
+			39 00 03 24 01 00     
465
+			39 00 03 25 01 00     
466
+			39 00 03 26 01 00     
467
+			39 00 03 27 01 00     
468
+			39 00 03 28 01 33     
469
+			39 00 03 29 01 33     
470
+			39 00 03 2a 01 00     
471
+			39 00 03 2b 01 00     
472
+			39 00 03 2c 01 00     
473
+			39 00 03 2d 01 00     
474
+			39 00 03 2e 01 00     
475
+			39 00 03 2f 01 00     
476
+			39 00 03 30 01 00     
477
+			39 00 03 31 01 00     
478
+			39 00 03 32 01 00     
479
+			39 00 03 33 01 00     
480
+			39 00 03 34 01 03     
481
+			39 00 03 35 01 00     
482
+			39 00 03 36 01 00     
483
+			39 00 03 37 01 00     
484
+			39 00 03 38 01 96     
485
+			39 00 03 39 01 00
486
+			39 00 03 3a 01 00 
487
+			39 00 03 3b 01 00
488
+			39 00 03 3c 01 00
489
+			39 00 03 3d 01 00
490
+			39 00 03 3e 01 00
491
+			39 00 03 3f 01 00
492
+			39 00 03 40 01 00
493
+			39 00 03 41 01 00
494
+			39 00 03 42 01 00
495
+			39 00 03 43 01 00  
496
+			39 00 03 44 01 00	 
497
+			39 00 03 50 01 00
498
+			39 00 03 51 01 23
499
+			39 00 03 52 01 45
500
+			39 00 03 53 01 67
501
+			39 00 03 54 01 89
502
+			39 00 03 55 01 AB
503
+			39 00 03 56 01 01
504
+			39 00 03 57 01 23
505
+			39 00 03 58 01 45
506
+			39 00 03 59 01 67
507
+			39 00 03 5a 01 89
508
+			39 00 03 5b 01 AB
509
+			39 00 03 5c 01 CD
510
+			39 00 03 5d 01 EF
511
+			39 00 03 5e 01 00
512
+			39 00 03 5f 01 08     
513
+			39 00 03 60 01 08     
514
+			39 00 03 61 01 06     
515
+			39 00 03 62 01 06     
516
+			39 00 03 63 01 01     
517
+			39 00 03 64 01 01     
518
+			39 00 03 65 01 00     
519
+			39 00 03 66 01 00     
520
+			39 00 03 67 01 02     
521
+			39 00 03 68 01 15     
522
+			39 00 03 69 01 15     
523
+			39 00 03 6a 01 14     
524
+			39 00 03 6b 01 14     
525
+			39 00 03 6c 01 0D     
526
+			39 00 03 6d 01 0D     
527
+			39 00 03 6e 01 0C      
528
+			39 00 03 6f 01 0C     
529
+			39 00 03 70 01 0F     
530
+			39 00 03 71 01 0F     
531
+			39 00 03 72 01 0E     
532
+			39 00 03 73 01 0E     
533
+			39 00 03 74 01 02     
534
+			39 00 03 75 01 08     
535
+			39 00 03 76 01 08     
536
+			39 00 03 77 01 06     
537
+			39 00 03 78 01 06     
538
+			39 00 03 79 01 01     
539
+			39 00 03 7a 01 01     
540
+			39 00 03 7b 01 00     
541
+			39 00 03 7c 01 00     
542
+			39 00 03 7d 01 02     
543
+			39 00 03 7e 01 15     
544
+			39 00 03 7f 01 15     
545
+			39 00 03 80 01 14     
546
+			39 00 03 81 01 14     
547
+			39 00 03 82 01 0D     
548
+			39 00 03 83 01 0D     
549
+			39 00 03 84 01 0C     
550
+			39 00 03 85 01 0C     
551
+			39 00 03 86 01 0F     
552
+			39 00 03 87 01 0F     
553
+			39 00 03 88 01 0E     
554
+			39 00 03 89 01 0E     
555
+			39 00 03 8A 01 02     
556
+			39 00 05 FF 03 98 81 04
557
+			39 00 03 C5 01 3A      
558
+			39 00 03 6E 01 2B      
559
+			39 00 03 6F 01 37      
560
+			39 00 03 3A 01 24      
561
+			39 00 03 8D 01 1A      
562
+			39 00 03 87 01 BA      
563
+			39 00 03 B2 01 D1
564
+			39 00 03 88 01 0B
565
+			39 00 03 38 01 01      
566
+			39 00 03 39 01 00
567
+			39 00 03 B5 01 02      
568
+			39 00 03 31 01 25      
569
+			39 00 03 3B 01 98  		
570
+			39 00 05 FF 03 98 81 01
571
+			39 00 03 22 01 0A      
572
+			39 00 03 31 01 00      
573
+			39 00 03 53 01 3D      
574
+			39 00 03 55 01 3D      
575
+			39 00 03 50 01 85      
576
+			39 00 03 51 01 80      
577
+			39 00 03 60 01 06      
578
+			39 00 03 62 01 20
579
+			39 00 03 A0 01 00
580
+			39 00 03 A1 01 21
581
+			39 00 03 A2 01 35
582
+			39 00 03 A3 01 19
583
+			39 00 03 A4 01 1E
584
+			39 00 03 A5 01 33
585
+			39 00 03 A6 01 27
586
+			39 00 03 A7 01 26
587
+			39 00 03 A8 01 AF
588
+			39 00 03 A9 01 1B
589
+			39 00 03 AA 01 27
590
+			39 00 03 AB 01 8D
591
+			39 00 03 AC 01 1A
592
+			39 00 03 AD 01 1B
593
+			39 00 03 AE 01 50
594
+			39 00 03 AF 01 26
595
+			39 00 03 B0 01 2B
596
+			39 00 03 B1 01 54
597
+			39 00 03 B2 01 5E
598
+			39 00 03 B3 01 23
599
+			39 00 03 C0 01 00
600
+			39 00 03 C1 01 21
601
+			39 00 03 C2 01 35
602
+			39 00 03 C3 01 19
603
+			39 00 03 C4 01 1E
604
+			39 00 03 C5 01 33
605
+			39 00 03 C6 01 27
606
+			39 00 03 C7 01 26
607
+			39 00 03 C8 01 AF
608
+			39 00 03 C9 01 1B
609
+			39 00 03 CA 01 27
610
+			39 00 03 CB 01 8D
611
+			39 00 03 CC 01 1A
612
+			39 00 03 CD 01 1B
613
+			39 00 03 CE 01 50
614
+			39 00 03 CF 01 26
615
+			39 00 03 D0 01 2B
616
+			39 00 03 D1 01 54
617
+			39 00 03 D2 01 5E
618
+			39 00 03 D3 01 23		
619
+			39 00 05 FF 03 98 81 00
700
620
 		];
701
621
 
702
622
 		panel-exit-sequence = [
..
..
@@ -757,303 +677,242 @@
757
677
 		status = "okay";
758
678
 		compatible = "simple-panel-dsi";
759
679
 		reg = <0>;
760
-		backlight = <&backlight1>;
761
-		reset-delay-ms = <60>;
762
-		enable-delay-ms = <60>;
763
-		prepare-delay-ms = <60>;
764
-		unprepare-delay-ms = <60>;
765
-		disable-delay-ms = <60>;
766
-		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
767
-			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
768
-		dsi,format = <MIPI_DSI_FMT_RGB888>;
769
-		dsi,lanes  = <4>;
770
-		panel-init-sequence = [
771
-			23 00 02 FE 21
772
-			23 00 02 04 00
773
-			23 00 02 00 64
774
-			23 00 02 2A 00
775
-			23 00 02 26 64
776
-			23 00 02 54 00
777
-			23 00 02 50 64
778
-			23 00 02 7B 00
779
-			23 00 02 77 64
780
-			23 00 02 A2 00
781
-			23 00 02 9D 64
782
-			23 00 02 C9 00
783
-			23 00 02 C5 64
784
-			23 00 02 01 71
785
-			23 00 02 27 71
786
-			23 00 02 51 71
787
-			23 00 02 78 71
788
-			23 00 02 9E 71
789
-			23 00 02 C6 71
790
-			23 00 02 02 89
791
-			23 00 02 28 89
792
-			23 00 02 52 89
793
-			23 00 02 79 89
794
-			23 00 02 9F 89
795
-			23 00 02 C7 89
796
-			23 00 02 03 9E
797
-			23 00 02 29 9E
798
-			23 00 02 53 9E
799
-			23 00 02 7A 9E
800
-			23 00 02 A0 9E
801
-			23 00 02 C8 9E
802
-			23 00 02 09 00
803
-			23 00 02 05 B0
804
-			23 00 02 31 00
805
-			23 00 02 2B B0
806
-			23 00 02 5A 00
807
-			23 00 02 55 B0
808
-			23 00 02 80 00
809
-			23 00 02 7C B0
810
-			23 00 02 A7 00
811
-			23 00 02 A3 B0
812
-			23 00 02 CE 00
813
-			23 00 02 CA B0
814
-			23 00 02 06 C0
815
-			23 00 02 2D C0
816
-			23 00 02 56 C0
817
-			23 00 02 7D C0
818
-			23 00 02 A4 C0
819
-			23 00 02 CB C0
820
-			23 00 02 07 CF
821
-			23 00 02 2F CF
822
-			23 00 02 58 CF
823
-			23 00 02 7E CF
824
-			23 00 02 A5 CF
825
-			23 00 02 CC CF
826
-			23 00 02 08 DD
827
-			23 00 02 30 DD
828
-			23 00 02 59 DD
829
-			23 00 02 7F DD
830
-			23 00 02 A6 DD
831
-			23 00 02 CD DD
832
-			23 00 02 0E 15
833
-			23 00 02 0A E9
834
-			23 00 02 36 15
835
-			23 00 02 32 E9
836
-			23 00 02 5F 15
837
-			23 00 02 5B E9
838
-			23 00 02 85 15
839
-			23 00 02 81 E9
840
-			23 00 02 AD 15
841
-			23 00 02 A9 E9
842
-			23 00 02 D3 15
843
-			23 00 02 CF E9
844
-			23 00 02 0B 14
845
-			23 00 02 33 14
846
-			23 00 02 5C 14
847
-			23 00 02 82 14
848
-			23 00 02 AA 14
849
-			23 00 02 D0 14
850
-			23 00 02 0C 36
851
-			23 00 02 34 36
852
-			23 00 02 5D 36
853
-			23 00 02 83 36
854
-			23 00 02 AB 36
855
-			23 00 02 D1 36
856
-			23 00 02 0D 6B
857
-			23 00 02 35 6B
858
-			23 00 02 5E 6B
859
-			23 00 02 84 6B
860
-			23 00 02 AC 6B
861
-			23 00 02 D2 6B
862
-			23 00 02 13 5A
863
-			23 00 02 0F 94
864
-			23 00 02 3B 5A
865
-			23 00 02 37 94
866
-			23 00 02 64 5A
867
-			23 00 02 60 94
868
-			23 00 02 8A 5A
869
-			23 00 02 86 94
870
-			23 00 02 B2 5A
871
-			23 00 02 AE 94
872
-			23 00 02 D8 5A
873
-			23 00 02 D4 94
874
-			23 00 02 10 D1
875
-			23 00 02 38 D1
876
-			23 00 02 61 D1
877
-			23 00 02 87 D1
878
-			23 00 02 AF D1
879
-			23 00 02 D5 D1
880
-			23 00 02 11 04
881
-			23 00 02 39 04
882
-			23 00 02 62 04
883
-			23 00 02 88 04
884
-			23 00 02 B0 04
885
-			23 00 02 D6 04
886
-			23 00 02 12 05
887
-			23 00 02 3A 05
888
-			23 00 02 63 05
889
-			23 00 02 89 05
890
-			23 00 02 B1 05
891
-			23 00 02 D7 05
892
-			23 00 02 18 AA
893
-			23 00 02 14 36
894
-			23 00 02 42 AA
895
-			23 00 02 3D 36
896
-			23 00 02 69 AA
897
-			23 00 02 65 36
898
-			23 00 02 8F AA
899
-			23 00 02 8B 36
900
-			23 00 02 B7 AA
901
-			23 00 02 B3 36
902
-			23 00 02 DD AA
903
-			23 00 02 D9 36
904
-			23 00 02 15 74
905
-			23 00 02 3F 74
906
-			23 00 02 66 74
907
-			23 00 02 8C 74
908
-			23 00 02 B4 74
909
-			23 00 02 DA 74
910
-			23 00 02 16 9F
911
-			23 00 02 40 9F
912
-			23 00 02 67 9F
913
-			23 00 02 8D 9F
914
-			23 00 02 B5 9F
915
-			23 00 02 DB 9F
916
-			23 00 02 17 DC
917
-			23 00 02 41 DC
918
-			23 00 02 68 DC
919
-			23 00 02 8E DC
920
-			23 00 02 B6 DC
921
-			23 00 02 DC DC
922
-			23 00 02 1D FF
923
-			23 00 02 19 03
924
-			23 00 02 47 FF
925
-			23 00 02 43 03
926
-			23 00 02 6E FF
927
-			23 00 02 6A 03
928
-			23 00 02 94 FF
929
-			23 00 02 90 03
930
-			23 00 02 BC FF
931
-			23 00 02 B8 03
932
-			23 00 02 E2 FF
933
-			23 00 02 DE 03
934
-			23 00 02 1A 35
935
-			23 00 02 44 35
936
-			23 00 02 6B 35
937
-			23 00 02 91 35
938
-			23 00 02 B9 35
939
-			23 00 02 DF 35
940
-			23 00 02 1B 45
941
-			23 00 02 45 45
942
-			23 00 02 6C 45
943
-			23 00 02 92 45
944
-			23 00 02 BA 45
945
-			23 00 02 E0 45
946
-			23 00 02 1C 55
947
-			23 00 02 46 55
948
-			23 00 02 6D 55
949
-			23 00 02 93 55
950
-			23 00 02 BB 55
951
-			23 00 02 E1 55
952
-			23 00 02 22 FF
953
-			23 00 02 1E 68
954
-			23 00 02 4C FF
955
-			23 00 02 48 68
956
-			23 00 02 73 FF
957
-			23 00 02 6F 68
958
-			23 00 02 99 FF
959
-			23 00 02 95 68
960
-			23 00 02 C1 FF
961
-			23 00 02 BD 68
962
-			23 00 02 E7 FF
963
-			23 00 02 E3 68
964
-			23 00 02 1F 7E
965
-			23 00 02 49 7E
966
-			23 00 02 70 7E
967
-			23 00 02 96 7E
968
-			23 00 02 BE 7E
969
-			23 00 02 E4 7E
970
-			23 00 02 20 97
971
-			23 00 02 4A 97
972
-			23 00 02 71 97
973
-			23 00 02 97 97
974
-			23 00 02 BF 97
975
-			23 00 02 E5 97
976
-			23 00 02 21 B5
977
-			23 00 02 4B B5
978
-			23 00 02 72 B5
979
-			23 00 02 98 B5
980
-			23 00 02 C0 B5
981
-			23 00 02 E6 B5
982
-			23 00 02 25 F0
983
-			23 00 02 23 E8
984
-			23 00 02 4F F0
985
-			23 00 02 4D E8
986
-			23 00 02 76 F0
987
-			23 00 02 74 E8
988
-			23 00 02 9C F0
989
-			23 00 02 9A E8
990
-			23 00 02 C4 F0
991
-			23 00 02 C2 E8
992
-			23 00 02 EA F0
993
-			23 00 02 E8 E8
994
-			23 00 02 24 FF
995
-			23 00 02 4E FF
996
-			23 00 02 75 FF
997
-			23 00 02 9B FF
998
-			23 00 02 C3 FF
999
-			23 00 02 E9 FF
1000
-			23 00 02 FE 3D
1001
-			23 00 02 00 04
1002
-			23 00 02 FE 23
1003
-			23 00 02 08 82
1004
-			23 00 02 0A 00
1005
-			23 00 02 0B 00
1006
-			23 00 02 0C 01
1007
-			23 00 02 16 00
1008
-			23 00 02 18 02
1009
-			23 00 02 1B 04
1010
-			23 00 02 19 04
1011
-			23 00 02 1C 81
1012
-			23 00 02 1F 00
1013
-			23 00 02 20 03
1014
-			23 00 02 23 04
1015
-			23 00 02 21 01
1016
-			23 00 02 54 63
1017
-			23 00 02 55 54
1018
-			23 00 02 6E 45
1019
-			23 00 02 6D 36
1020
-			23 00 02 FE 3D
1021
-			23 00 02 55 78
1022
-			23 00 02 FE 20
1023
-			23 00 02 26 30
1024
-			23 00 02 FE 3D
1025
-			23 00 02 20 71
1026
-			23 00 02 50 8F
1027
-			23 00 02 51 8F
1028
-			23 00 02 FE 00
1029
-			23 00 02 35 00
1030
-			05 78 01 11
1031
-			05 1E 01 29
1032
-		];
680
+		power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
681
+		vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
682
+		reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
683
+		vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
684
+		reset-delay-ms = <200>;
685
+        enable-delay-ms = <60>;
686
+        init-delay-ms = <120>;
687
+        disable-delay-ms = <60>;
688
+        prepare-delay-ms = <120>;
689
+        unprepare-delay-ms = <120>;
690
+        backlight = <&backlight1>;
691
+        dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
692
+                MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
693
+        dsi,format = <MIPI_DSI_FMT_RGB888>;
694
+        dsi,lanes  = <4>;
695
+
696
+        panel-init-sequence = [
697
+            39 00 04 FF 98 81 03
698
+			15 00 02 01 00
699
+			15 00 02 02 00
700
+			15 00 02 03 53     
701
+			15 00 02 04 D3     
702
+			15 00 02 05 00     
703
+			15 00 02 06 0D     
704
+			15 00 02 07 08     
705
+			15 00 02 08 00     
706
+			15 00 02 09 00     
707
+			15 00 02 0a 00     
708
+			15 00 02 0b 00     
709
+			15 00 02 0c 00     
710
+			15 00 02 0d 00     
711
+			15 00 02 0e 00     
712
+			15 00 02 0f 28     
713
+			15 00 02 10 28     
714
+			15 00 02 11 00     
715
+			15 00 02 12 00     
716
+			15 00 02 13 00     
717
+			15 00 02 14 00     
718
+			15 00 02 15 00     
719
+			15 00 02 16 00     
720
+			15 00 02 17 00     
721
+			15 00 02 18 00     
722
+			15 00 02 19 00     
723
+			15 00 02 1a 00     
724
+			15 00 02 1b 00     
725
+			15 00 02 1c 00     
726
+			15 00 02 1d 00     
727
+			15 00 02 1e 40     
728
+			15 00 02 1f 80     
729
+			15 00 02 20 06     
730
+			15 00 02 21 01     
731
+			15 00 02 22 00     
732
+			15 00 02 23 00     
733
+			15 00 02 24 00     
734
+			15 00 02 25 00     
735
+			15 00 02 26 00     
736
+			15 00 02 27 00     
737
+			15 00 02 28 33     
738
+			15 00 02 29 33     
739
+			15 00 02 2a 00     
740
+			15 00 02 2b 00     
741
+			15 00 02 2c 00     
742
+			15 00 02 2d 00     
743
+			15 00 02 2e 00     
744
+			15 00 02 2f 00     
745
+			15 00 02 30 00     
746
+			15 00 02 31 00     
747
+			15 00 02 32 00     
748
+			15 00 02 33 00     
749
+			15 00 02 34 03     
750
+			15 00 02 35 00     
751
+			15 00 02 36 00     
752
+			15 00 02 37 00     
753
+			15 00 02 38 96     
754
+			15 00 02 39 00
755
+			15 00 02 3a 00 
756
+			15 00 02 3b 00
757
+			15 00 02 3c 00
758
+			15 00 02 3d 00
759
+			15 00 02 3e 00
760
+			15 00 02 3f 00
761
+			15 00 02 40 00
762
+			15 00 02 41 00
763
+			15 00 02 42 00
764
+			15 00 02 43 00  
765
+			15 00 02 44 00	 
766
+			15 00 02 50 00
767
+			15 00 02 51 23
768
+			15 00 02 52 45
769
+			15 00 02 53 67
770
+			15 00 02 54 89
771
+			15 00 02 55 AB
772
+			15 00 02 56 01
773
+			15 00 02 57 23
774
+			15 00 02 58 45
775
+			15 00 02 59 67
776
+			15 00 02 5a 89
777
+			15 00 02 5b AB
778
+			15 00 02 5c CD
779
+			15 00 02 5d EF
780
+			15 00 02 5e 00
781
+			15 00 02 5f 08     
782
+			15 00 02 60 08     
783
+			15 00 02 61 06     
784
+			15 00 02 62 06     
785
+			15 00 02 63 01     
786
+			15 00 02 64 01     
787
+			15 00 02 65 00     
788
+			15 00 02 66 00     
789
+			15 00 02 67 02     
790
+			15 00 02 68 15     
791
+			15 00 02 69 15     
792
+			15 00 02 6a 14     
793
+			15 00 02 6b 14     
794
+			15 00 02 6c 0D     
795
+			15 00 02 6d 0D     
796
+			15 00 02 6e 0C      
797
+			15 00 02 6f 0C     
798
+			15 00 02 70 0F     
799
+			15 00 02 71 0F     
800
+			15 00 02 72 0E     
801
+			15 00 02 73 0E     
802
+			15 00 02 74 02     
803
+			15 00 02 75 08     
804
+			15 00 02 76 08     
805
+			15 00 02 77 06     
806
+			15 00 02 78 06     
807
+			15 00 02 79 01     
808
+			15 00 02 7a 01     
809
+			15 00 02 7b 00     
810
+			15 00 02 7c 00     
811
+			15 00 02 7d 02     
812
+			15 00 02 7e 15     
813
+			15 00 02 7f 15     
814
+			15 00 02 80 14     
815
+			15 00 02 81 14     
816
+			15 00 02 82 0D     
817
+			15 00 02 83 0D     
818
+			15 00 02 84 0C     
819
+			15 00 02 85 0C     
820
+			15 00 02 86 0F     
821
+			15 00 02 87 0F     
822
+			15 00 02 88 0E     
823
+			15 00 02 89 0E     
824
+			15 00 02 8A 02     
825
+			39 00 04 FF 98 81 04
826
+			15 00 02 C5 3A      
827
+			15 00 02 6E 2B      
828
+			15 00 02 6F 37      
829
+			15 00 02 3A 24      
830
+			15 00 02 8D 1A      
831
+			15 00 02 87 BA      
832
+			15 00 02 B2 D1
833
+			15 00 02 88 0B
834
+			15 00 02 38 01      
835
+			15 00 02 39 00
836
+			15 00 02 B5 02      
837
+			15 00 02 31 25      
838
+			15 00 02 3B 98  		
839
+			39 00 04 FF 98 81 01
840
+			15 00 02 22 0A      
841
+			15 00 02 31 00      
842
+			15 00 02 53 3D      
843
+			15 00 02 55 3D      
844
+			15 00 02 50 85      
845
+			15 00 02 51 80      
846
+			15 00 02 60 06      
847
+			15 00 02 62 20
848
+			15 00 02 A0 00
849
+			15 00 02 A1 21
850
+			15 00 02 A2 35
851
+			15 00 02 A3 19
852
+			15 00 02 A4 1E
853
+			15 00 02 A5 33
854
+			15 00 02 A6 27
855
+			15 00 02 A7 26
856
+			15 00 02 A8 AF
857
+			15 00 02 A9 1B
858
+			15 00 02 AA 27
859
+			15 00 02 AB 8D
860
+			15 00 02 AC 1A
861
+			15 00 02 AD 1B
862
+			15 00 02 AE 50
863
+			15 00 02 AF 26
864
+			15 00 02 B0 2B
865
+			15 00 02 B1 54
866
+			15 00 02 B2 5E
867
+			15 00 02 B3 23
868
+			15 00 02 C0 00
869
+			15 00 02 C1 21
870
+			15 00 02 C2 35
871
+			15 00 02 C3 19
872
+			15 00 02 C4 1E
873
+			15 00 02 C5 33
874
+			15 00 02 C6 27
875
+			15 00 02 C7 26
876
+			15 00 02 C8 AF
877
+			15 00 02 C9 1B
878
+			15 00 02 CA 27
879
+			15 00 02 CB 8D
880
+			15 00 02 CC 1A
881
+			15 00 02 CD 1B
882
+			15 00 02 CE 50
883
+			15 00 02 CF 26
884
+			15 00 02 D0 2B
885
+			15 00 02 D1 54
886
+			15 00 02 D2 5E
887
+			15 00 02 D3 23		
888
+			39 00 04 FF 98 81 00
889
+			15 78 01 11 
890
+            15 05 01 29 
891
+        ];
1033
892
 
1034
893
 		panel-exit-sequence = [
1035
894
 			05 00 01 28
1036
895
 			05 00 01 10
1037
896
 		];
1038
897
 
1039
-		disp_timings1: display-timings {
1040
-			native-mode = <&dsi1_timing0>;
1041
-			dsi1_timing0: timing0 {
1042
-				clock-frequency = <132000000>;
1043
-				hactive = <1080>;
1044
-				vactive = <1920>;
1045
-				hfront-porch = <15>;
1046
-				hsync-len = <2>;
1047
-				hback-porch = <30>;
1048
-				vfront-porch = <15>;
1049
-				vsync-len = <2>;
1050
-				vback-porch = <15>;
1051
-				hsync-active = <0>;
1052
-				vsync-active = <0>;
1053
-				de-active = <0>;
1054
-				pixelclk-active = <1>;
1055
-			};
1056
-		};
898
+         disp_timings1: display-timings {
899
+                                        native-mode = <&dsi1_timing0>;
900
+                                        dsi1_timing0: timing0 {
901
+                                        clock-frequency = <69000000>;
902
+                                        hactive = <800>;
903
+                                        vactive = <1280>;
904
+                                        hfront-porch = <32>;
905
+                                        hsync-len = <20>;
906
+                                        hback-porch = <20>;
907
+                                        vfront-porch = <16>;
908
+                                        vsync-len = <5>;
909
+                                        vback-porch = <12>;
910
+                                        hsync-active = <0>;
911
+                                        vsync-active = <0>;
912
+                                        de-active = <0>;
913
+                                        pixelclk-active = <1>;
914
+                                };
915
+                        };
1057
916
 
1058
917
 		ports {
1059
918
 			#address-cells = <1>;
..
..
@@ -1114,7 +973,7 @@
1114
973
 	status = "okay";
1115
974
 
1116
975
 	vdd_cpu: tcs4525@1c {
1117
-		compatible = "tcs,tcs452x";
976
+		compatible = "tcs,tcs4525";
1118
977
 		reg = <0x1c>;
1119
978
 		vin-supply = <&vcc5v0_sys>;
1120
979
 		regulator-compatible = "fan53555-reg";
..
..
@@ -1398,15 +1257,6 @@
1398
1257
 
1399
1258
 &i2c1 {
1400
1259
 	status = "okay";
1401
-
1402
-	gt1x: gt1x@14 {
1403
-		compatible = "goodix,gt1x";
1404
-		reg = <0x14>;
1405
-		pinctrl-names = "default";
1406
-		pinctrl-0 = <&touch_gpio>;
1407
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1408
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1409
-	};
1410
1260
 };
1411
1261
 
1412
1262
 &i2c5 {
..
..
@@ -1483,11 +1333,6 @@
1483
1333
 
1484
1334
 &pinctrl {
1485
1335
 
1486
-	headphone {
1487
-		hp_det: hp-det {
1488
-			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1489
-		};
1490
-	};
1491
1336
 
1492
1337
 	mxc6655xa {
1493
1338
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
..
..
@@ -1503,12 +1348,12 @@
1503
1348
 
1504
1349
 		soc_slppin_gpio: soc_slppin_gpio {
1505
1350
 			rockchip,pins =
1506
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1351
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
1507
1352
 		};
1508
1353
 
1509
1354
 		soc_slppin_slp: soc_slppin_slp {
1510
1355
 			rockchip,pins =
1511
-				<0 RK_PA2 1 &pcfg_pull_up>;
1356
+				<0 RK_PA2 1 &pcfg_pull_none>;
1512
1357
 		};
1513
1358
 
1514
1359
 		soc_slppin_rst: soc_slppin_rst {
..
..
@@ -1527,7 +1372,8 @@
1527
1372
 
1528
1373
 	sdio-pwrseq {
1529
1374
 		wifi_enable_h: wifi-enable-h {
1530
-			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
1375
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1376
+			//WIFI_REG_ON_H_GPIO2_B1
1531
1377
 		};
1532
1378
 	};
1533
1379
 
..
..
@@ -1576,6 +1422,10 @@
1576
1422
 };
1577
1423
 
1578
1424
 &pwm4 {
1425
+	status = "okay";
1426
+};
1427
+
1428
+&pwm6 {
1579
1429
 	status = "okay";
1580
1430
 };
1581
1431
 
..
..
@@ -1730,15 +1580,18 @@
1730
1580
 
1731
1581
 &sdhci {
1732
1582
 	bus-width = <8>;
1733
-	supports-emmc;
1583
+	no-sdio;
1584
+	no-sd;
1734
1585
 	non-removable;
1735
1586
 	max-frequency = <200000000>;
1587
+	full-pwr-cycle-in-suspend;
1736
1588
 	status = "okay";
1737
1589
 };
1738
1590
 
1739
1591
 &sdmmc0 {
1740
1592
 	max-frequency = <150000000>;
1741
-	supports-sd;
1593
+	no-sdio;
1594
+	no-mmc;
1742
1595
 	bus-width = <4>;
1743
1596
 	cap-mmc-highspeed;
1744
1597
 	cap-sd-highspeed;