forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-11-22 9ca5fbcb63a8dcaee0527f96afb91dc4b4bd8fa9
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -141,10 +141,17 @@
141141 gpio_function = <0>;
142142 };
143143
144
- wifi_power_en {
145
- gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
144
+ usb_ogt {
145
+ gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
146146 gpio_function = <0>;
147147 };
148
+
149
+ m2_wifi_pwr {
150
+ gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
151
+ gpio_function = <0>;
152
+ };
153
+
154
+
148155 #if 0
149156 do1 {
150157 gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
....@@ -192,23 +199,17 @@
192199 compatible = "simple-panel";
193200 backlight = <&backlight>;
194201 power-supply = <&vcc3v3_lcd0_n>;
195
- enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
196
- reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
197
- edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
202
+ enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
203
+ edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_PWBLK_H_GPIO0_B7
198204 edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
199205 bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
200206 bpc = <8>;
201207 prepare-delay-ms = <200>;
202208 enable-delay-ms = <20>;
203
- lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2
204
- lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3
205
- lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4
206
- lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
207
- nodka-lvds = <15>;
208209
209210 display-timings {
210
- native-mode = <&timing0>;
211
- timing0: timing0 {
211
+ native-mode = <&timing>;
212
+ timing: timing {
212213 clock-frequency = <72500000>;
213214 hactive = <1280>;
214215 vactive = <800>;
....@@ -225,8 +226,8 @@
225226 };
226227 };
227228 ports {
228
- panel_in: endpoint {
229
- remote-endpoint = <&edp_out>;
229
+ panel_in_lvds: endpoint {
230
+ remote-endpoint = <&lvds_out>;
230231 };
231232 };
232233 };
....@@ -331,16 +332,29 @@
331332 &edp {
332333 //hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
333334 force-hpd;
335
+ status = "disabled";
336
+};
337
+
338
+&lvds {
334339 status = "okay";
335340 ports {
336341 port@1 {
337342 reg = <1>;
338
- edp_out: endpoint {
339
- remote-endpoint = <&panel_in>;
343
+ lvds_out: endpoint {
344
+ remote-endpoint = <&panel_in_lvds>;
340345 };
341346 };
342347
343348 };
349
+};
350
+
351
+&route_lvds{
352
+ status = "okay";
353
+ connect = <&vp2_out_lvds>;
354
+};
355
+
356
+&lvds_in_vp2 {
357
+ status = "okay";
344358 };
345359
346360 &edp_phy {
....@@ -359,7 +373,7 @@
359373 phy-mode = "rgmii";
360374 clock_in_out = "output";
361375
362
- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
376
+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
363377 snps,reset-active-low;
364378 /* Reset time is 20ms, 100ms for rtl8211f */
365379 snps,reset-delays-us = <0 20000 100000>;
....@@ -379,7 +393,9 @@
379393 rx_delay = <0x2f>;
380394
381395 phy-handle = <&rgmii_phy0>;
382
- status = "disabled";
396
+
397
+ status = "okay";
398
+
383399 };
384400
385401 &gmac1 {
....@@ -516,7 +532,7 @@
516532 };
517533
518534 &video_phy0 {
519
- status = "disabled";
535
+ status = "okay";
520536 };
521537
522538 &video_phy1 {
....@@ -527,8 +543,21 @@
527543 status = "okay";
528544 };
529545
546
+&pcie2x1 {
547
+ reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
548
+ vpcie3v3-supply = <&vcc3v3_pcie>;
549
+ status = "okay";
550
+};
551
+
530552 &pcie3x2 {
531
- reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
553
+ reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
554
+ vpcie3v3-supply = <&vcc3v3_pcie>;
555
+ status = "disabled";
556
+};
557
+
558
+&pcie3x1 {
559
+ rockchip,bifurcation;
560
+ reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
532561 vpcie3v3-supply = <&vcc3v3_pcie>;
533562 status = "okay";
534563 };
....@@ -544,12 +573,6 @@
544573 wireless-wlan {
545574 wifi_host_wake_irq: wifi-host-wake-irq {
546575 rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
547
- };
548
- };
549
-
550
- wireless-bluetooth {
551
- uart1_gpios: uart1-gpios {
552
- rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
553576 };
554577 };
555578
....@@ -614,7 +637,7 @@
614637
615638
616639 &route_edp {
617
- status = "okay";
640
+ status = "disabled";
618641 connect = <&vp1_out_edp>;
619642 };
620643
....@@ -668,17 +691,7 @@
668691
669692 &wireless_bluetooth {
670693 compatible = "bluetooth-platdata";
671
- clocks = <&rk809 1>;
672
- clock-names = "ext_clock";
673
- //wifi-bt-power-toggle;
674
- uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
675
- pinctrl-names = "default", "rts_gpio";
676
- pinctrl-0 = <&uart1m0_rtsn>;
677
- pinctrl-1 = <&uart1_gpios>;
678
- BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
679
- BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
680
- BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
681
- status = "okay";
694
+ status = "disabled";
682695 };
683696
684697 &uart0 {
....@@ -688,7 +701,7 @@
688701 &uart1 {
689702 pinctrl-names = "default";
690703 pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
691
- status = "okay";
704
+ status = "disabled";
692705 };
693706
694707 &uart3 {