适配硬件——最终版

rk3588/.dr4-rk3588.dtb.cmd

@@ -32,12 +32,15 @@ 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-typec-rk3588.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
+  arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
   arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \
+  arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.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/dr4-rk3588.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb)
 

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

@@ -28,9 +28,12 @@ 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-typec-rk3588.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
+ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi
+ arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.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

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
@@ -14571,20 +14558,6 @@
                 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 8 0>;
-            vin-supply = <&vcc5v0_usb>;
-            pinctrl-names = "default";
-            pinctrl-0 = <&vcc5v0_host_en>;
-        };
 };
 
 
@@ -14685,7 +14658,7 @@
 
 
 &usbdrd_dwc3_0 {
-    dr_mode = "host";
+    dr_mode = "otg";
     usb-role-switch;
     port {
         #address-cells = <1>;
@@ -14697,24 +14670,6 @@
     };
 };
 
-&u2phy1_otg {
-    phy-supply = <&vcc5v0_host>;
-};
-
-
-&combphy2_psu {
-    status = "okay";
-};
-
-&usbhost3_0 {
-    status = "okay";
-};
-
-&usbhost_dwc3_0 {
-    dr_mode = "host";
-    status = "okay";
-};
-
 &pinctrl {
         usb-typec {
                 usbc0_int: usbc0-int {
@@ -14726,52 +14681,60 @@
                 };
 
        };
-        usb {
-            vcc5v0_host_en: vcc5v0-host-en {
-                rockchip,pins = <4 3 0 &pcfg_pull_none>;
-  };
- };
 };
 # 12 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi" 1
 
-
+&u2phy2 {
-
-
-# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi" 1
-
-&mdio0 {
-    rgmii_phy0: phy@1 {
-        compatible = "ethernet-phy-ieee802.3-c22";
-        reg = <0x1>;
-    };
-};
-
-&gmac0 {
-
-    phy-mode = "rgmii-rxid";
-    clock_in_out = "input";
-
-    snps,reset-gpio = <&gpio2 20 1>;
-    snps,reset-active-low;
-
-    snps,reset-delays-us = <0 20000 100000>;
-
-    pinctrl-names = "default";
-    pinctrl-0 = <&gmac0_miim
-             &gmac0_tx_bus2
-             &gmac0_rx_bus2
-             &gmac0_rgmii_clk
-             &gmac0_rgmii_bus
-            &gmac0_clkinout
-            &eth0_pins>;
-
-    tx_delay = <0x44>;
-
-
-    phy-handle = <&rgmii_phy0>;
     status = "okay";
 };
-# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+
+&u2phy3 {
+    status = "okay";
+};
+
+
+
+
+
+&u2phy2_host {
+    status = "okay";
+};
+
+&u2phy3_host {
+    status = "okay";
+};
+
+&usb_host0_ehci {
+    status = "okay";
+};
+
+&usb_host0_ohci {
+    status = "okay";
+};
+
+&usb_host1_ehci {
+    status = "okay";
+};
+
+&usb_host1_ohci {
+    status = "okay";
+};
+
+
+
+
+&usbhost3_0 {
+    status = "disabled";
+};
+
+&usbhost_dwc3_0 {
+    status = "disabled";
+};
+# 13 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+
+
+
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi" 1
 
 &mdio1 {
@@ -14807,8 +14770,91 @@
     phy-handle = <&rgmii_phy1>;
     status = "okay";
 };
-# 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
-# 64 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 30 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi" 1
+
+/ {
+
+    reserved-memory {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+
+
+        cma {
+            compatible = "shared-dma-pool";
+            reusable;
+            reg = <0x0 (256 * 0x100000) 0x0 (128 * 0x100000)>;
+            linux,cma-default;
+        };
+    };
+
+  hdmiin-sound {
+    compatible = "simple-audio-card";
+    simple-audio-card,format = "i2s";
+    simple-audio-card,name = "rockchip,hdmiin";
+    simple-audio-card,bitclock-master = <&dailink0_master>;
+    simple-audio-card,frame-master = <&dailink0_master>;
+    status = "okay";
+    simple-audio-card,cpu {
+      sound-dai = <&i2s7_8ch>;
+    };
+    dailink0_master: simple-audio-card,codec {
+       sound-dai = <&hdmiin_dc>;
+   };
+  };
+
+  hdmiin_dc: hdmiin-dc {
+     compatible = "rockchip,dummy-codec";
+     #sound-dai-cells = <0>;
+ };
+
+};
+
+&i2s7_8ch {
+  status = "okay";
+};
+
+
+&hdmirx_ctrler {
+    status = "okay";
+
+
+    hpd-trigger-level = <1>;
+    hdmirx-det-gpios = <&gpio1 29 1>;
+    pinctrl-0 = <&hdmim1_rx_cec &hdmim2_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda>;
+    pinctrl-names = "default";
+};
+# 31 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 1
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi" 1
+&hdmi0 {
+        status = "okay";
+};
+
+&hdmi0_in_vp0 {
+        status = "okay";
+};
+
+&hdmi0_sound {
+        status = "okay";
+};
+
+&i2s5_8ch {
+        status = "okay";
+};
+
+&hdptxphy_hdmi0 {
+        status = "okay";
+};
+
+&route_hdmi0 {
+    status = "okay";
+    connect = <&vp0_out_hdmi0>;
+};
+# 2 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi" 1
 &hdmi1 {
     status = "okay";
@@ -14838,8 +14884,26 @@
         status = "okay";
         connect = <&vp1_out_hdmi1>;
 };
-# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 3 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2
-# 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi" 1
+&dp0 {
+    status = "okay";
+};
+
+&dp0_in_vp2 {
+    status = "okay";
+};
+
+&dp0_sound{
+        status = "okay";
+};
+
+&spdif_tx2 {
+        status = "okay";
+};
+# 4 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2
+# 66 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 89 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 / {
     model = "dr4-rk3588";
 
@@ -14875,7 +14939,12 @@
                 status = "okay";
                 compatible = "rp_power";
                 rp_not_deep_sleep = <1>;
-# 142 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 136 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+                led {
+                        gpio_num = <&gpio4 6 0>;
+                        gpio_function = <3>;
+                };
+
                 usb-host-power {
                         gpio_num = <&gpio2 17 0>;
                         gpio_function = <4>;
@@ -14888,7 +14957,7 @@
     };
 
         rp_gpio{
-                status = "okay";
+                status = "disabled";
                 compatible = "rp_gpio";
 
                 gpio3c7 {
@@ -14899,34 +14968,10 @@
 };
 
 
-&uart0 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart1m1_xfer>;
-};
-
 &uart3 {
     status = "okay";
     pinctrl-names = "default";
-    pinctrl-0 = <&uart3m0_xfer>;
+    pinctrl-0 = <&uart3m2_xfer>;
-};
-
-&uart4 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart4m1_xfer>;
-};
-
-&uart5 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart5m0_xfer>;
 };
 
 &uart6 {
@@ -14935,23 +14980,19 @@
     pinctrl-0 = <&uart6m2_xfer>;
 };
 
+&uart4 {
+    status = "okay";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart4m2_xfer>;
+};
+
 &uart7 {
     status = "okay";
     pinctrl-names = "default";
-    pinctrl-0 = <&uart7m1_xfer>;
+    pinctrl-0 = <&uart7m2_xfer>;
 };
 
-&uart8 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart8m0_xfer>;
-};
 
-&uart9 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart9m2_xfer>;
-};
 
 &can0 {
     assigned-clocks = <&cru 112>;

rk3588/dr4-rk3588.dts

@@ -2,18 +2,17 @@
 //#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"
 
 /* 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-gmac0.dtsi"
 #include "rp-eth-gmac1.dtsi"
 
 /* pcie */
@@ -28,7 +27,7 @@
 // #include "rp-wifi-bt-ap6275p-rk3588.dtsi"
 
 /* hdmi rx */
-// #include "rp-hdmirx.dtsi"
+#include "rp-hdmirx.dtsi"
 
 /* camera */
 /***********all camera config********/
@@ -60,10 +59,10 @@
 //#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"
+#include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi"
 
 /* lcd */
 // #include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi"
@@ -134,10 +133,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>;
@@ -151,7 +150,7 @@
     };
 
         rp_gpio{
-                status = "okay";
+                status = "disabled";
                 compatible = "rp_gpio";
 
                 gpio3c7 {
@@ -162,34 +161,10 @@
 };
 
 
-&uart0 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart1m1_xfer>;
-};
-
 &uart3 {
     status = "okay";
     pinctrl-names = "default";
-    pinctrl-0 = <&uart3m0_xfer>;
+    pinctrl-0 = <&uart3m2_xfer>;
-};
-
-&uart4 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart4m1_xfer>;
-};
-
-&uart5 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart5m0_xfer>;
 };
 
 &uart6 {
@@ -198,23 +173,19 @@
     pinctrl-0 = <&uart6m2_xfer>;
 };
 
+&uart4 {
+    status = "okay";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart4m2_xfer>;
+};
+
 &uart7 {
     status = "okay";
     pinctrl-names = "default";
-    pinctrl-0 = <&uart7m1_xfer>;
+    pinctrl-0 = <&uart7m2_xfer>;
 };
 
-&uart8 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart8m0_xfer>;
-};
 
-&uart9 {
-    status = "okay";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart9m2_xfer>;
-};
 
 &can0 {
     assigned-clocks = <&cru CLK_CAN0>;

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 = "input";
+    clock_in_out = "output";
 
-    snps,reset-gpio = <&gpio2 RK_PC4 GPIO_ACTIVE_LOW>;
+    snps,reset-gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>;
     snps,reset-active-low;
     // Reset time is 20ms, 100ms for rtl8211f 
     snps,reset-delays-us = <0 20000 100000>;
@@ -21,9 +21,7 @@
              &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 = "okay";
+    status = "disabled";
 };
 

rk3588/rp-usb-typec-rk3588.dtsi

@@ -11,20 +11,6 @@
                 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>;
-        };
 };
 
 
@@ -125,7 +111,7 @@
 
 
 &usbdrd_dwc3_0 {
-    dr_mode = "host";
+    dr_mode = "otg";
     usb-role-switch;
     port {
         #address-cells = <1>;
@@ -137,24 +123,6 @@
     };
 };
 
-&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 {
@@ -166,9 +134,4 @@
                 };
  
        };
-       	usb {
-            vcc5v0_host_en: vcc5v0-host-en {
-                rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
 };