取消触摸屏对IO的占用

rk3588/.dr4-rk3588.dtb.cmd

@@ -32,27 +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/rd-rk3588-lcd-gpio.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.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-pcie3.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-5g.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-audio-rt5640.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-wifi-bt-ap6275p-rk3588.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dcphy1.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy0.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy1.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-mipi0-5-720-1280-v2-boxTP.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,24 +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/rd-rk3588-lcd-gpio.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.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-pcie3.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-5g.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-audio-rt5640.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-wifi-bt-ap6275p-rk3588.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dcphy1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy0.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi
+ arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi

rk3588/dr4-rk3588.dts

@@ -2,40 +2,41 @@
 //#include "../rk3588-evb4-lp4-v10-linux.dts"
 #include "rp-rk3588-board.dtsi"
 
-#include "rp-tp-i2c6-gt911.dtsi"
-#include "rd-rk3588-lcd-gpio.dtsi"
+// #include "rp-tp-i2c6-gt911.dtsi"
+// #include "rd-rk3588-lcd-gpio.dtsi"
 
 #include "rpdzkj_config.dtsi"
 
 /* usb */
-#include "rp-usb-typec-rk3588.dtsi"
+// #include "rp-usb-typec-rk3588.dtsi"
 #include "rp-usb-host.dtsi"
 
 /* ethernet */
-#include "rp-eth-pcie2gmac-rk3588.dtsi"
+// #include "rp-eth-pcie2gmac-rk3588.dtsi"
+#include "rp-eth-gmac0.dtsi"
 #include "rp-eth-gmac1.dtsi"
 
 /* pcie */
 #include "rp-pcie-power-rk3588.dtsi"
-#include "rp-pcie3.dtsi" //need comment when use board of  make it youself,and remove the pcie function
-#include "rp-pcie-5g.dtsi"
+// #include "rp-pcie3.dtsi" //need comment when use board of  make it youself,and remove the pcie function
+// #include "rp-pcie-5g.dtsi"
 
 /* audio */
-#include "rp-audio-rt5640.dtsi"
+// #include "rp-audio-rt5640.dtsi"
 
 /* wifi/bt */
-#include "rp-wifi-bt-ap6275p-rk3588.dtsi"
+// #include "rp-wifi-bt-ap6275p-rk3588.dtsi"
 
 /* hdmi rx */
-#include "rp-hdmirx.dtsi"
+// #include "rp-hdmirx.dtsi"
 
 /* camera */
 /***********all camera config********/
 
 //#include "rp-camera-dcphy0.dtsi"
-#include "rp-camera-dcphy1.dtsi"
-#include "rp-camera-dphy0.dtsi"
-#include "rp-camera-dphy1.dtsi"
+// #include "rp-camera-dcphy1.dtsi"
+// #include "rp-camera-dphy0.dtsi"
+// #include "rp-camera-dphy1.dtsi"
 
 //#include "rp-camera-dcphy0-ov13855.dtsi"
 //#include "rp-camera-dcphy1-ov13855.dtsi"
@@ -62,10 +63,10 @@
 //#include "rp-lcd-hdmi0.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"
+// #include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi"
 
 /* lcd */
-#include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi"
+// #include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi"
 //#include "rp-lcd-mipi0-7-720-1280.dtsi"
 //#include "rp-lcd-mipi0-8-800-1280-v3.dtsi"
 //#include "rp-lcd-mipi0-8-1200-1920.dtsi"
@@ -114,7 +115,7 @@
             thermal-zone = "soc-thermal";
             threshold-temp = <60000>; //60C
             running-time = <10000>; //10s
-            status = "okay";
+            status = "disable";
         };
 
         rp_power{
@@ -133,64 +134,61 @@
                 //        gpio_function = <4>;
                 //};
 
-                led {
-                        gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
-                        gpio_function = <3>;
-                };
+                // led {
+                //         gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+                //         gpio_function = <3>;
+                // };
 
                 usb-host-power {
                         gpio_num = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
                         gpio_function = <4>;
                 };
 
-                usb-hub-reset {
-                        gpio_num = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>;
-                        gpio_function = <4>;
-                };
+                // usb-hub-reset {
+                //         gpio_num = <&gpio3 RK_PB2 GPIO_ACTIVE_HIGH>;
+                //         gpio_function = <4>;
+                // };
     };
 
-        rp_gpio{
-                status = "okay";
-                compatible = "rp_gpio";
+        // rp_gpio{
+        //         status = "okay";
+        //         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>;
-};
-
-&uart6 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart6m0_xfer>;
+        //         gpio3c7 {
+        //                 gpio_num = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;
+        //                 gpio_function = <0>;
+        //         };
+        // };
 };
 
 &uart7 {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart7m1_xfer>;
+	fifo-depth =<4096>;	
+	rx-fifo-depth =<2048>;
+	tx-fifo-depth =<2048>;
+	dma-names = "tx", "rx";
 };
 
 &uart8 {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart8m0_xfer>;
+	fifo-depth =<4096>;	
+	rx-fifo-depth =<2048>;
+	tx-fifo-depth =<2048>;
+	dma-names = "tx", "rx";
 };
 
+
 &can0 {
 	assigned-clocks = <&cru CLK_CAN0>;
 	assigned-clock-rates = <200000000>;
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&can0m0_pins>;
+	
 };
 
 &can1 {
@@ -201,8 +199,31 @@
 	pinctrl-0 = <&can1m1_pins>;
 }; 
 
+// &can2 {
+// 	assigned-clocks = <&cru CLK_CAN2>;
+// 	assigned-clock-rates = <200000000>;
+// 	status = "okay";
+// 	pinctrl-names = "default";
+// 	pinctrl-0 = <&can2m1_pins>;
+// }; 
+
+// &spi3 {
+//         // status = "disabled";
+//         status = "okay";
+//         max-freq = <48000000>;
+//         dev-port = <1>;
+//         pinctrl-0 = <&spi3m1_cs1 &spi3m1_pins>;
+//         spidev0: spidev@00 {
+//             status = "okay";
+//             compatible = "rockchip,spidev";
+//             reg = <0x00>;
+//             spi-max-frequency = <48000000>;
+//         };
+// };
+
+
 &i2c4 {
-    status = "okay";
+    status = "disable";
     pinctrl-names = "default";
     pinctrl-0 = <&i2c4m1_xfer>;
 
@@ -223,22 +244,22 @@
 
 
 &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";
-};
+// &display_subsystem {
+// clocks = <&hdptxphy_hdmi_clk0>, <&hdptxphy_hdmi_clk1>;
+// clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll";
+// };
 
-&hdptxphy_hdmi_clk0 {
-            status = "okay";
-};
+// &hdptxphy_hdmi_clk0 {
+//             status = "okay";
+// };
 
-&hdptxphy_hdmi_clk1 {
-            status = "okay";
-};
+// &hdptxphy_hdmi_clk1 {
+//             status = "okay";
+// };

rk3588/rp-eth-gmac0.dtsi

@@ -9,9 +9,9 @@
 &gmac0 {
     // Use rgmii-rxid mode to disable rx delay inside Soc
     phy-mode = "rgmii-rxid";
-    clock_in_out = "output";
+    clock_in_out = "input";
 
-    snps,reset-gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>;
+    snps,reset-gpio = <&gpio2 RK_PC4 GPIO_ACTIVE_LOW>;
     snps,reset-active-low;
     // Reset time is 20ms, 100ms for rtl8211f 
     snps,reset-delays-us = <0 20000 100000>;
@@ -21,7 +21,9 @@
              &gmac0_tx_bus2
              &gmac0_rx_bus2
              &gmac0_rgmii_clk
-             &gmac0_rgmii_bus>;
+             &gmac0_rgmii_bus
+             &gmac0_clkinout
+             &eth0_pins>;
 
     tx_delay = <0x44>;
     // rx_delay = <0x4f>;