add wifi 4g uart0,3,4,5,7,9

hc

2023-02-15 e6ab316063efe269dbc459a0a7939fb55abd8c44

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -82,7 +82,7 @@
82
82
 		regulator-max-microvolt = <3300000>;
83
83
 		vin-supply = <&vcc5v0_sys>;
84
84
 	};
85
-
85
+#if 0
86
86
 	vcc_camera: vcc-camera-regulator {
87
87
 		compatible = "regulator-fixed";
88
88
 		gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
..
..
@@ -92,16 +92,15 @@
92
92
 		enable-active-high;
93
93
 		regulator-always-on;
94
94
 		regulator-boot-on;
95
-	
96
95
     	};
96
+#endif
97
97
 
98
98
 	    nk_io_init {
99
99
                 compatible = "nk_io_control";
100
-                hub_host2_5v_gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; //USB_HOST_PWREN_H_GPIO0_A6
101
-		usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
102
-		lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
103
-		lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
104
-		vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
100
+				usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
101
+				lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
102
+				lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
103
+				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
105
104
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
106
105
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
107
106
 //              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
..
..
@@ -112,23 +111,21 @@
112
111
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
113
112
                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
114
113
                 
115
-		edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
114
+				edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
116
115
                 edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
117
-        	edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
118
-        	edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
119
-        	edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
116
+				edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
117
+				edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
118
+				edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
120
119
                 edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
121
120
 //              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
122
121
 //              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
123
122
 		
124
-		wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
123
+				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
125
124
 
126
-  //      pinctrl-names = "default";
127
-//        pinctrl-0 = <&nk_io_gpio>;
128
-        nodka_lvds = <9>;
125
+				pinctrl-names = "default";
126
+				pinctrl-0 = <&nk_io_gpio>;
127
+				nodka_lvds = <9>;
129
128
         };
130
-
131
-	
132
129
 };
133
130
 
134
131
 &combphy0_us {
..
..
@@ -428,13 +425,13 @@
428
425
 };
429
426
 
430
427
 &pinctrl {
431
-	cam {
432
-		camera_pwr: camera-pwr {
433
-			rockchip,pins =
434
-				/* camera power en */
435
-				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
436
-		};
437
-	};
428
+//	cam {
429
+//		camera_pwr: camera-pwr {
430
+//			rockchip,pins =
431
+//				/* camera power en */
432
+//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
433
+//		};
434
+//	};
438
435
 	headphone {
439
436
 		hp_det: hp-det {
440
437
 			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
..
..
@@ -443,26 +440,19 @@
443
440
 
444
441
 	wireless-wlan {
445
442
 		wifi_host_wake_irq: wifi-host-wake-irq {
446
-			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
443
+			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
447
444
 		};
448
445
 	};
449
446
 
450
447
 	wireless-bluetooth {
451
-		uart8_gpios: uart8-gpios {
452
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
448
+		uart1_gpios: uart1-gpios {
449
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
453
450
 		};
454
451
 	};
455
-
456
-	nk_io_gpio: nk_io_gpio_col{
457
-                        rockchip,pins =
458
-                                <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
459
-                                <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>,
460
-                                <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>,
461
-                                <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
462
-                                <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>,
463
-                                <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>,
464
-                                <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
465
-                                <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
452
+	nk_io_init{
453
+		nk_io_gpio: nk-io-gpio{
454
+            rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
455
+		};
466
456
 	};
467
457
 };
468
458
 
..
..
@@ -503,19 +493,23 @@
503
493
 };
504
494
 
505
495
 &sdmmc2 {
506
-	max-frequency = <150000000>;
507
-	supports-sdio;
508
-	bus-width = <4>;
509
-	disable-wp;
510
-	cap-sd-highspeed;
511
-	cap-sdio-irq;
512
-	keep-power-in-suspend;
513
-	mmc-pwrseq = <&sdio_pwrseq>;
514
-	non-removable;
515
-	pinctrl-names = "default";
516
-	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
517
-	sd-uhs-sdr104;
518
-	status = "okay";
496
+        status = "disabled";
497
+};
498
+
499
+&sdmmc1 {
500
+        max-frequency = <150000000>;
501
+        supports-sdio;
502
+        bus-width = <4>;
503
+        disable-wp;
504
+        cap-sd-highspeed;
505
+        cap-sdio-irq;
506
+        keep-power-in-suspend;
507
+        mmc-pwrseq = <&sdio_pwrseq>;
508
+        non-removable;
509
+        pinctrl-names = "default";
510
+        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
511
+        sd-uhs-sdr104;
512
+        status = "okay";
519
513
 };
520
514
 
521
515
 &spdif_8ch {
..
..
@@ -551,12 +545,42 @@
551
545
 	clocks = <&rk809 1>;
552
546
 	clock-names = "ext_clock";
553
547
 	//wifi-bt-power-toggle;
554
-	uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
548
+	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
549
+	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
555
550
 	pinctrl-names = "default", "rts_gpio";
556
-	pinctrl-0 = <&uart8m0_rtsn>;
557
-	pinctrl-1 = <&uart8_gpios>;
551
+	pinctrl-0 = <&uart1m0_rtsn>;
552
+	pinctrl-1 = <&uart1_gpios>;
558
553
 	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
559
554
 	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
560
555
 	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
556
+	status = "disabled";
557
+};
558
+
559
+&uart0 {
561
560
 	status = "okay";
562
561
 };
562
+
563
+&uart3 {
564
+	status = "okay";
565
+	pinctrl-0 = <&uart3m1_xfer>;
566
+};
567
+
568
+&uart4 {
569
+	status = "okay";
570
+	pinctrl-0 = <&uart4m1_xfer>;
571
+};
572
+
573
+&uart5 {
574
+	status = "okay";
575
+	pinctrl-0 = <&uart5m1_xfer>;
576
+};
577
+
578
+&uart7 {
579
+	status = "okay";
580
+	pinctrl-0 = <&uart7m1_xfer>;
581
+};
582
+
583
+&uart9 {
584
+	status = "okay";
585
+	pinctrl-0 = <&uart9m1_xfer>;
586
+};