适配硬件——最终版

基于硬件修改设备树
2025-05-26 14:41:06 +08:00 · 2025-05-14 13:56:07 +08:00
10 changed files with 311 additions and 341 deletions
--- a/rk3588/.dr4-rk3588.dtb.cmd
+++ b/rk3588/.dr4-rk3588.dtb.cmd
@@ -32,13 +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/zkzg-usb-host.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.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-gmac1.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/zkzg-pcie.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)

--- a/rk3588/.dr4-rk3588.dtb.d.pre.tmp
+++ b/rk3588/.dr4-rk3588.dtb.d.pre.tmp
@@ -28,10 +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/zkzg-usb-host.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.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-gmac1.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/zkzg-pcie.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
--- a/rk3588/.dr4-rk3588.dtb.dts.tmp
+++ b/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
@@ -14557,9 +14544,159 @@
 # 9 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2


+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi" 1
+
+/ {
+        vbus5v0_typec: vbus5v0-typec {
+                compatible = "regulator-fixed";
+                regulator-name = "vbus5v0_typec";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                gpio = <&gpio1 2 0>;
+                vin-supply = <&vcc5v0_usb>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&typec5v_pwren>;
+        };
+};
+
+
+
+&i2c4 {
+    status = "okay";
+    pinctrl-names = "default";
+    pinctrl-0 = <&i2c4m1_xfer>;
+
+    usbc0: fusb302@22 {
+        compatible = "fcs,fusb302";
+        reg = <0x22>;
+        interrupt-parent = <&gpio0>;
+        interrupts = <27 8>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&usbc0_int>;
+        vbus-supply = <&vbus5v0_typec>;
+        status = "okay";
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@0 {
+                reg = <0>;
+                usbc0_role_sw: endpoint@0 {
+                    remote-endpoint = <&dwc3_0_role_switch>;
+                };
+            };
+        };
+
+        usb_con: connector {
+            compatible = "usb-c-connector";
+            label = "USB-C";
+            data-role = "dual";
+            power-role = "dual";
+            try-power-role = "sink";
+            op-sink-microwatt = <1000000>;
+            sink-pdos =
+                <(((0) << 30) | ((1 << 26)) | ((((5000) / 50) & 0x3ff) << 10) | ((((1000) / 10) & 0x3ff) << 0))>;
+            source-pdos =
+                <(((0) << 30) | ((1 << 26)) | ((((5000) / 50) & 0x3ff) << 10) | ((((3000) / 10) & 0x3ff) << 0))>;
+
+            altmodes {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                altmode@0 {
+                    reg = <0>;
+                    svid = <0xff01>;
+                    vdo = <0xffffffff>;
+                };
+            };
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+                    usbc0_orien_sw: endpoint {
+                        remote-endpoint = <&usbdp_phy0_orientation_switch>;
+                    };
+                };
+
+                port@1 {
+                    reg = <1>;
+                    dp_altmode_mux: endpoint {
+                        remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+                    };
+                };
+            };
+        };
+    };
+};
+
+
+&usbdp_phy0 {
+    orientation-switch;
+    svid = <0xff01>;
+    sbu1-dc-gpios = <&gpio3 28 0>;
+    sbu2-dc-gpios = <&gpio3 29 0>;
+
+    port {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        usbdp_phy0_orientation_switch: endpoint@0 {
+            reg = <0>;
+            remote-endpoint = <&usbc0_orien_sw>;
+        };
+
+        usbdp_phy0_dp_altmode_mux: endpoint@1 {
+            reg = <1>;
+            remote-endpoint = <&dp_altmode_mux>;
+        };
+    };
+};
+
+
+&usbdrd_dwc3_0 {
+    dr_mode = "otg";
+    usb-role-switch;
+    port {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        dwc3_0_role_switch: endpoint@0 {
+            reg = <0>;
+            remote-endpoint = <&usbc0_role_sw>;
+        };
+    };
+};
+
+&pinctrl {
+        usb-typec {
+                usbc0_int: usbc0-int {
+                        rockchip,pins = <0 27 0 &pcfg_pull_up>;
+                };
+
+                typec5v_pwren: typec5v-pwren {
+                        rockchip,pins = <1 2 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 {
+    status = "okay";
+};
+
+&u2phy3 {
+    status = "okay";
+};
+
+
+


-# 1 "arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.dtsi" 1
 &u2phy2_host {
    status = "okay";
 };
@@ -14568,7 +14705,6 @@
    status = "okay";
 };

-
 &usb_host0_ehci {
    status = "okay";
 };
@@ -14584,45 +14720,21 @@
 &usb_host1_ohci {
    status = "okay";
 };
-# 14 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2



-# 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>;
-    };
+&usbhost3_0 {
+    status = "disabled";
 };

-&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";
+&usbhost_dwc3_0 {
+    status = "disabled";
 };
-# 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 13 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+
+
+
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi" 1

 &mdio1 {
@@ -14658,74 +14770,91 @@
    phy-handle = <&rgmii_phy1>;
    status = "okay";
 };
-# 19 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 30 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi" 1

-
-# 1 "arch/arm64/boot/dts/rockchip/rk3588/zkzg-pcie.dtsi" 1
 / {
-    vcc3v3_pcie30: vcc3v3-pcie30 {
-        compatible = "regulator-fixed";
-        regulator-name = "vcc3v3_pcie30";
-        regulator-min-microvolt = <3300000>;
-        regulator-max-microvolt = <3300000>;
-        enable-active-high;
-        gpios = <&gpio3 19 0>;
-        startup-delay-us = <5000>;
-        vin-supply = <&vcc12v_dcin>;
+
+    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>;
+ };
+
 };

-&combphy0_ps {
+&i2s7_8ch {
  status = "okay";
 };

-&combphy1_ps {
+
+&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";
 };

-&combphy2_psu {
+&hdmi0_in_vp0 {
        status = "okay";
 };

-&pcie2x1l0 {
-    phys = <&combphy1_ps 2>;
-    reset-gpios = <&gpio4 5 0>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie2x1l1 {
-    phys = <&combphy2_psu 2>;
-    reset-gpios = <&gpio4 2 0>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie2x1l2 {
-    reset-gpios = <&gpio4 17 0>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie30phy {
-    rockchip,pcie30-phymode = <0>;
+&hdmi0_sound {
        status = "okay";
 };

-&pcie3x2 {
-    reset-gpios = <&gpio4 8 0>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
+&i2s5_8ch {
        status = "okay";
 };

-&pcie3x4 {
-    num-lanes = <2>;
-    reset-gpios = <&gpio4 14 0>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
+&hdptxphy_hdmi0 {
        status = "okay";
 };
-# 22 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
-# 68 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+
+&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";
@@ -14755,8 +14884,26 @@
        status = "okay";
        connect = <&vp1_out_hdmi1>;
 };
-# 69 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
-# 94 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 3 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2
+# 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";

@@ -14792,7 +14939,12 @@
                status = "okay";
                compatible = "rp_power";
                rp_not_deep_sleep = <1>;
-# 146 "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>;
@@ -14805,7 +14957,7 @@
    };

        rp_gpio{
-                status = "okay";
+                status = "disabled";
                compatible = "rp_gpio";

                gpio3c7 {
@@ -14816,59 +14968,31 @@
 };


-&uart0 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart1m1_xfer>;
-};
-
 &uart3 {
-    status = "disabled";
+    status = "okay";
    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>;
+    pinctrl-0 = <&uart3m2_xfer>;
 };

 &uart6 {
-    status = "disabled";
+    status = "okay";
    pinctrl-names = "default";
    pinctrl-0 = <&uart6m2_xfer>;
 };

+&uart4 {
+    status = "okay";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart4m2_xfer>;
+};
+
 &uart7 {
-    status = "disabled";
+    status = "okay";
    pinctrl-names = "default";
-    pinctrl-0 = <&uart7m1_xfer>;
+    pinctrl-0 = <&uart7m2_xfer>;
 };

-&uart8 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart8m0_xfer>;
-};

-&uart9 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart9m2_xfer>;
-};

 &can0 {
    assigned-clocks = <&cru 112>;
--- a/rk3588/dr4-rk3588.dtb
+++ b/rk3588/dr4-rk3588.dtb
--- a/rk3588/dr4-rk3588.dts
+++ b/rk3588/dr4-rk3588.dts
@@ -2,24 +2,19 @@
 //#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 "zkzg-usb-host.dtsi"
+#include "rp-usb-typec-rk3588.dtsi"
+#include "rp-usb-host.dtsi"

 /* ethernet */
 // #include "rp-eth-pcie2gmac-rk3588.dtsi"
-#include "rp-eth-gmac0.dtsi"
 #include "rp-eth-gmac1.dtsi"

-/* pcie */
-#include "zkzg-pcie.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
@@ -32,7 +27,7 @@
 // #include "rp-wifi-bt-ap6275p-rk3588.dtsi"

 /* hdmi rx */
-// #include "rp-hdmirx.dtsi"
+#include "rp-hdmirx.dtsi"

 /* camera */
 /***********all camera config********/
@@ -64,10 +59,10 @@
 //#include "rp-camera-dphy0-imx415.dtsi"
 /******************************************/

-// #include "rp-lcd-hdmi0.dtsi"        //batch ignore
-#include "rp-lcd-hdmi1.dtsi"        //batch ignore
+//#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"
@@ -138,10 +133,10 @@
                //        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>;
@@ -155,7 +150,7 @@
    };

        rp_gpio{
-                status = "okay";
+                status = "disabled";
                compatible = "rp_gpio";

                gpio3c7 {
@@ -166,59 +161,31 @@
 };


-&uart0 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart1m1_xfer>;
-};
-
 &uart3 {
-    status = "disabled";
+    status = "okay";
    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>;
+    pinctrl-0 = <&uart3m2_xfer>;
 };

 &uart6 {
-    status = "disabled";
+    status = "okay";
    pinctrl-names = "default";
    pinctrl-0 = <&uart6m2_xfer>;
 };

+&uart4 {
+    status = "okay";
+    pinctrl-names = "default";
+    pinctrl-0 = <&uart4m2_xfer>;
+};
+
 &uart7 {
-    status = "disabled";
+    status = "okay";
    pinctrl-names = "default";
-    pinctrl-0 = <&uart7m1_xfer>;
+    pinctrl-0 = <&uart7m2_xfer>;
 };

-&uart8 {
-    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>;
--- a/rk3588/rp-eth-gmac0.dtsi
+++ b/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_clkinout
-            &eth0_pins>;
+             &gmac0_rgmii_bus>;

    tx_delay = <0x44>;
    // rx_delay = <0x4f>; 
--- a/rk3588/rp-usb-host.dtsi
+++ b/rk3588/rp-usb-host.dtsi
@@ -43,6 +43,6 @@
 };

 &usbhost_dwc3_0 {
-    status = "okay";
+    status = "disabled";
 };

--- a/rk3588/rp-usb-typec-rk3588.dtsi
+++ b/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>;
-		};
-	};
 };
--- a/rk3588/zkzg-pcie.dtsi
+++ b/rk3588/zkzg-pcie.dtsi
@@ -1,62 +0,0 @@
-/ {
-    vcc3v3_pcie30: vcc3v3-pcie30 {
-        compatible = "regulator-fixed";
-        regulator-name = "vcc3v3_pcie30";
-        regulator-min-microvolt = <3300000>;
-        regulator-max-microvolt = <3300000>;
-        enable-active-high;
-        gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
-        startup-delay-us = <5000>;
-        vin-supply = <&vcc12v_dcin>;
-    };
-};
-
-&combphy0_ps {
-    status = "okay";
-};
-
-&combphy1_ps {
-    status = "okay";
-};
-
-&combphy2_psu {
-    status = "okay";
-};
-
-&pcie2x1l0 {
-    phys = <&combphy1_ps PHY_TYPE_PCIE>;
-    reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie2x1l1 {
-    phys = <&combphy2_psu PHY_TYPE_PCIE>;
-    reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie2x1l2 {
-    reset-gpios = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "disabled";
-};
-
-&pcie30phy {
-    rockchip,pcie30-phymode = <PHY_MODE_PCIE_NANBNB>;
-    status = "okay";
-};
-
-&pcie3x2 {
-    reset-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "okay";
-};
-
-&pcie3x4 {
-    num-lanes = <2>;
-    reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-    vpcie3v3-supply = <&vcc3v3_pcie30>;
-    status = "okay";
-};
--- a/rk3588/zkzg-usb-host.dtsi
+++ b/rk3588/zkzg-usb-host.dtsi
@@ -1,24 +0,0 @@
-&u2phy2_host {
-    status = "okay";
-};
-
-&u2phy3_host {
-    status = "okay";
-};
-
-// USB2.0 HOST0/1 Controller
-&usb_host0_ehci {
-    status = "okay";
-};
-
-&usb_host0_ohci {
-    status = "okay";
-};
-
-&usb_host1_ehci {
-    status = "okay";
-};
-
-&usb_host1_ohci {
-    status = "okay";
-};
Author	SHA1	Message	Date
zhangpeng	8d68461a3e	适配硬件——最终版	2025-05-26 14:41:06 +08:00
zhangpeng	7c5f178fe2	基于硬件修改设备树	2025-05-14 13:56:07 +08:00