forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-07-06 0d92c6001e626cf3cfa86b826ccc10a16115901e
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -19,6 +19,7 @@
1919 rk_headset: rk-headset {
2020 compatible = "rockchip_headset";
2121 headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+ spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
2223 pinctrl-names = "default";
2324 pinctrl-0 = <&hp_det>;
2425 };
....@@ -101,7 +102,7 @@
101102 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
102103 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
103104 hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
104
- spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
105
+// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
105106 wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
106107 // pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4
107108 pinctrl-names = "default";
....@@ -543,7 +544,8 @@
543544 // };
544545 headphone {
545546 hp_det: hp-det {
546
- rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
547
+ rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
548
+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
547549 };
548550 };
549551
....@@ -578,12 +580,15 @@
578580 <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
579581 <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
580582 <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
581
- <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
582583 <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
583584 <3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
584585 <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
585586 <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
586587 <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
588
+ <2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
589
+ <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
590
+ <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
591
+ <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
587592 <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
588593 };
589594 };
....@@ -673,20 +678,25 @@
673678 clock-names = "ext_clock";
674679 //wifi-bt-power-toggle;
675680 uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
676
- BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
677681 pinctrl-names = "default", "rts_gpio";
678682 pinctrl-0 = <&uart1m0_rtsn>;
679683 pinctrl-1 = <&uart1_gpios>;
680
- BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
681
- BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
682
- BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
683
- status = "disabled";
684
+ BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
685
+ BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
686
+ BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
687
+ status = "okay";
684688 };
685689
686690 &uart0 {
687691 status = "okay";
688692 };
689693
694
+&uart1 {
695
+ pinctrl-names = "default";
696
+ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
697
+ status = "okay";
698
+};
699
+
690700 &uart3 {
691701 status = "okay";
692702 pinctrl-0 = <&uart3m1_xfer>;