耐辐照相机，已经注释掉一些不用的串口

rk3588/.dr4-rk3588.dtb.cmd

@@ -33,26 +33,11 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \
   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-gmac0.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.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

@@ -29,23 +29,8 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \
  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-gmac0.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.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/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

rk3588/dr4-rk3588.dts

@@ -3,39 +3,40 @@
 #include "rp-rk3588-board.dtsi"
 
 #include "rp-tp-i2c6-gt911.dtsi"
-#include "rd-rk3588-lcd-gpio.dtsi"
+// #include "rd-rk3588-lcd-gpio.dtsi"
 
 #include "rpdzkj_config.dtsi"
 
 /* usb */
 #include "rp-usb-typec-rk3588.dtsi"
-#include "rp-usb-host.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-pcie-power-rk3588.dtsi"
-#include "rp-pcie3.dtsi" //need comment when use board of  make it youself,and remove the pcie function
+// #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-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-dcphy1.dtsi"
-#include "rp-camera-dphy0.dtsi"
+// #include "rp-camera-dphy0.dtsi"
-#include "rp-camera-dphy1.dtsi"
+// #include "rp-camera-dphy1.dtsi"
 
 //#include "rp-camera-dcphy0-ov13855.dtsi"
 //#include "rp-camera-dcphy1-ov13855.dtsi"
@@ -60,12 +61,12 @@
 /******************************************/
 
 // #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"
+// #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 = "disabled";
         };
 
         rp_power{
@@ -133,10 +134,10 @@
                 //        gpio_function = <4>;
                 //};
 
-                led {
+                // led {
-                        gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+                //         gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
-                        gpio_function = <3>;
+                //         gpio_function = <3>;
-                };
+                // };
 
                 usb-host-power {
                         gpio_num = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
@@ -162,33 +163,63 @@
 
 
 &uart0 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart0m0_xfer>;
 };
 
-&uart6 {
+&uart1 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
-    pinctrl-0 = <&uart6m0_xfer>;
+    pinctrl-0 = <&uart1m1_xfer>;
+};
+
+&uart3 {
+    status = "disabled";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart3m0_xfer>;
+};
+
+&uart4 {
+    status = "disabled";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart4m1_xfer>;
+};
+
+&uart5 {
+    status = "disabled";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart5m0_xfer>;
+};
+
+&uart6 {
+    status = "disabled";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart6m2_xfer>;
 };
 
 &uart7 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart7m1_xfer>;
 };
 
 &uart8 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart8m0_xfer>;
 };
 
+&uart9 {
+    status = "disabled";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart9m2_xfer>;
+};
+
 &can0 {
     assigned-clocks = <&cru CLK_CAN0>;
     assigned-clock-rates = <200000000>;
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&can0m0_pins>;
 };
@@ -196,13 +227,13 @@
 &can1 {
     assigned-clocks = <&cru CLK_CAN1>;
     assigned-clock-rates = <200000000>;
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&can1m1_pins>;
 };
 
 &i2c4 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&i2c4m1_xfer>;
 

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>; 

rk3588/rp-usb-host.dtsi

@@ -43,6 +43,6 @@
 };
 
 &usbhost_dwc3_0 {
-    status = "disabled";
+    status = "okay";
 };
 

rk3588/rp-usb-typec-rk3588.dtsi

@@ -11,6 +11,20 @@
                 pinctrl-names = "default";
                 pinctrl-0 = <&typec5v_pwren>;
         };
+
+        vcc5v0_host: vcc5v0-host {
+            compatible = "regulator-fixed";
+            regulator-name = "vcc5v0_host";
+            regulator-boot-on;
+            regulator-always-on;
+            regulator-min-microvolt = <5000000>;
+            regulator-max-microvolt = <5000000>;
+            enable-active-high;
+            gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+            vin-supply = <&vcc5v0_usb>;
+            pinctrl-names = "default";
+            pinctrl-0 = <&vcc5v0_host_en>;
+        };
 };
 
 
@@ -111,7 +125,7 @@
 
 
 &usbdrd_dwc3_0 {
-    dr_mode = "otg";
+    dr_mode = "host";
     usb-role-switch;
     port {
         #address-cells = <1>;
@@ -123,6 +137,24 @@
     };
 };
 
+&u2phy1_otg {
+    phy-supply = <&vcc5v0_host>;
+};
+
+// 使能USB3.1/SATA/PCIe Combo PHY
+&combphy2_psu {
+    status = "okay";
+};
+// 配置USB3.1 HOST2 Controller
+&usbhost3_0 {
+    status = "okay";
+};
+
+&usbhost_dwc3_0 {
+    dr_mode = "host";
+    status = "okay";
+};
+
 &pinctrl {
         usb-typec {
                 usbc0_int: usbc0-int {
@@ -134,4 +166,9 @@
                 };
  
        };
+       	usb {
+            vcc5v0_host_en: vcc5v0-host-en {
+                rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
 };