取消触摸屏对IO的占用

rk3588/.dr4-rk3588.dtb.cmd

@@ -32,13 +32,11 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \
   scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
   arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \
 
 arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb)
 

rk3588/.dr4-rk3588.dtb.d.pre.tmp

@@ -28,10 +28,8 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \
  scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
  arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \
+ arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi

rk3588/.dr4-rk3588.dtb.dts.tmp

@@ -14517,20 +14517,7 @@
 /delete-node/ &backlight;
 # 4 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
 
-# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi" 1
 
-&i2c6 {
-    status = "okay";
-    pinctrl-names = "default";
-  pinctrl-0 = <&i2c6m0_xfer>;
-
-  goodix_ts:goodix_ts@5d {
-        status = "okay";
-        compatible = "goodix,gt9xx";
-        reg = <0x5d>;
-  };
-};
-# 6 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
 
 
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi" 1
@@ -14720,37 +14707,6 @@
 
 };
 # 21 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
-# 64 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
-# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi" 1
-&hdmi1 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd &hdmim2_tx1_scl &hdmim2_tx1_sda>;
-};
-
-&hdmi1_in_vp1 {
-    status = "okay";
-};
-
-&hdmi1_sound {
-    status = "okay";
-};
-
-&i2s6_8ch {
-        status = "okay";
-};
-
-
-&hdptxphy_hdmi1 {
-    status = "okay";
-};
-
-
-&route_hdmi1 {
-        status = "okay";
-        connect = <&vp1_out_hdmi1>;
-};
-# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
 # 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 / {
     model = "dr4-rk3588";
@@ -14780,7 +14736,7 @@
             thermal-zone = "soc-thermal";
             threshold-temp = <60000>;
             running-time = <10000>;
-            status = "disabled";
+            status = "disable";
         };
 
         rp_power{
@@ -14798,83 +14754,7 @@
 
 
     };
-
+# 162 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
-        rp_gpio{
-                status = "disabled";
-                compatible = "rp_gpio";
-
-                gpio3c7 {
-                        gpio_num = <&gpio3 23 0>;
-                        gpio_function = <0>;
-                };
-        };
-};
-
-
-
-&uart0 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart0m0_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-
-
-};
-
-&uart1 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart1m2_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-};
-
-&uart3 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart3m0_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-};
-
-&uart4 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart4m1_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-
-};
-
-&uart5 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart5m0_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-
-};
-
-&uart6 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart6m2_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
-  dma-names = "tx", "rx";
-
 };
 
 &uart7 {
@@ -14897,17 +14777,6 @@
  dma-names = "tx", "rx";
 };
 
-&uart9 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&uart9m2_xfer>;
- fifo-depth =<4096>;
- rx-fifo-depth =<2048>;
- tx-fifo-depth =<2048>;
- dma-names = "tx", "rx";
-};
-
-
 
 &can0 {
  assigned-clocks = <&cru 112>;
@@ -14925,30 +14794,9 @@
  pinctrl-names = "default";
  pinctrl-0 = <&can1m1_pins>;
 };
-
+# 225 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
-&can2 {
- assigned-clocks = <&cru 116>;
- assigned-clock-rates = <200000000>;
- status = "disabled";
- pinctrl-names = "default";
- pinctrl-0 = <&can2m1_pins>;
-};
-
-&spi3 {
-    status = "okay";
-    pinctrl-0 = <&spi3m1_pins &spi3m1_cs1>;
-
-    spi3_dev@0 {
-        compatible = "rockchip,spidev";
-        reg = <0>;
-        spi-max-frequency = <12000000>;
-        spi-lsb-first;
-    };
-};
-
-
 &i2c4 {
-    status = "disabled";
+    status = "disable";
     pinctrl-names = "default";
     pinctrl-0 = <&i2c4m1_xfer>;
 
@@ -14967,23 +14815,11 @@
 
 };
 
+
 &sdmmc {
-    status = "okay";
+    status = "disabled";
 };
 
 &fiq_debugger {
     rockchip,baudrate = <115200>;
 };
-
-&display_subsystem {
-clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
-
-&hdptxphy_hdmi_clk0 {
-            status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-            status = "okay";
-};

rk3588/dr4-rk3588.dts

@@ -2,7 +2,7 @@
 //#include "../rk3588-evb4-lp4-v10-linux.dts"
 #include "rp-rk3588-board.dtsi"
 
-#include "rp-tp-i2c6-gt911.dtsi"
+// #include "rp-tp-i2c6-gt911.dtsi"
 // #include "rd-rk3588-lcd-gpio.dtsi"
 
 #include "rpdzkj_config.dtsi"
@@ -60,8 +60,8 @@
 //#include "rp-camera-dphy0-imx415.dtsi"
 /******************************************/
 
-// #include "rp-lcd-hdmi0.dtsi"        //batch ignore
+//#include "rp-lcd-hdmi0.dtsi"        //batch ignore
-#include "rp-lcd-hdmi1.dtsi"        //batch ignore
+//#include "rp-lcd-hdmi1.dtsi"        //batch ignore
 //#include "rp-lcd-typec-dp0.dtsi"    //usb edp0, must be enable rp-usb-typec.dtsi, batch ignore 
 // #include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi"
 
@@ -115,7 +115,7 @@
             thermal-zone = "soc-thermal";
             threshold-temp = <60000>; //60C
             running-time = <10000>; //10s
-            status = "disabled";
+            status = "disable";
         };
 
         rp_power{
@@ -150,82 +150,15 @@
                 // };
     };
 
-        rp_gpio{
+        // rp_gpio{
-                status = "disabled";
+        //         status = "okay";
-                compatible = "rp_gpio";
+        //         compatible = "rp_gpio";
-
-                gpio3c7 {
-                        gpio_num = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;
-                        gpio_function = <0>;
-                };
-        };
-};
-
-
-
-&uart0 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0m0_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
-
-
-};
-
-&uart1 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart1m2_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
-};
-
-&uart3 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart3m0_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
-};
-
-&uart4 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart4m1_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
-	
-};
-
-&uart5 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart5m0_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
-	
-};
-
-&uart6 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart6m2_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-		dma-names = "tx", "rx";
 
+        //         gpio3c7 {
+        //                 gpio_num = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;
+        //                 gpio_function = <0>;
+        //         };
+        // };
 };
 
 &uart7 {
@@ -248,17 +181,6 @@
 	dma-names = "tx", "rx";
 };
 
-&uart9 {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart9m2_xfer>;
-	fifo-depth =<4096>;	
-	rx-fifo-depth =<2048>;
-	tx-fifo-depth =<2048>;
-	dma-names = "tx", "rx";
-};
-
-
 
 &can0 {
 	assigned-clocks = <&cru CLK_CAN0>;
@@ -277,29 +199,31 @@
 	pinctrl-0 = <&can1m1_pins>;
 }; 
 
-&can2 {
+// &can2 {
-	assigned-clocks = <&cru CLK_CAN2>;
+// 	assigned-clocks = <&cru CLK_CAN2>;
-	assigned-clock-rates = <200000000>;
+// 	assigned-clock-rates = <200000000>;
-	status = "disabled";
+// 	status = "okay";
-	pinctrl-names = "default";
+// 	pinctrl-names = "default";
-	pinctrl-0 = <&can2m1_pins>;
+// 	pinctrl-0 = <&can2m1_pins>;
-}; 
+// }; 
 
-&spi3 {
+// &spi3 {
-    status = "okay";
+//         // status = "disabled";
-    pinctrl-0 = <&spi3m1_pins &spi3m1_cs1>;
+//         status = "okay";
-    
+//         max-freq = <48000000>;
-    spi3_dev@0 {
+//         dev-port = <1>;
-        compatible = "rockchip,spidev";
+//         pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>;
-        reg = <0>;
+//         spidev0: spidev@00 {
-        spi-max-frequency = <12000000>;
+//             status = "okay";
-        spi-lsb-first;
+//             compatible = "rockchip,spidev";
-    };
+//             reg = <0x00>;
-};
+//             spi-max-frequency = <48000000>;
+//         };
+// };
 
 
 &i2c4 {
-    status = "disabled";
+    status = "disable";
     pinctrl-names = "default";
     pinctrl-0 = <&i2c4m1_xfer>;
 
@@ -318,23 +242,24 @@
 
 };
 
+
 &sdmmc {
-    status = "okay";
+    status = "disabled";
 };
 
 &fiq_debugger {
     rockchip,baudrate = <115200>;
 };
 
-&display_subsystem {
+// &display_subsystem {
-clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
+// clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
-clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
+// clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
-};
+// };
 
-&hdptxphy_hdmi_clk0 {
+// &hdptxphy_hdmi_clk0 {
-            status = "okay";
+//             status = "okay";
-};
+// };
 
-&hdptxphy_hdmi_clk1 {
+// &hdptxphy_hdmi_clk1 {
-            status = "okay";
+//             status = "okay";
-};
+// };