pcie 网卡插槽

rk3588/.dr4-rk3588.dtb.cmd

@@ -34,9 +34,10 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \
   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/zkzg-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/zkzg-pcie.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

@@ -30,7 +30,8 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \
  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/zkzg-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/zkzg-pcie.dtsi \
  arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi

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

@@ -14557,183 +14557,34 @@
 # 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>;
-        };
-
-        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>;
-        };
-};
 
 
-
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.dtsi" 1
-&i2c4 {
+&u2phy2_host {
-    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 = "host";
-    usb-role-switch;
-    port {
-        #address-cells = <1>;
-        #size-cells = <0>;
-        dwc3_0_role_switch: endpoint@0 {
-            reg = <0>;
-            remote-endpoint = <&usbc0_role_sw>;
-        };
-    };
-};
-
-&u2phy1_otg {
-    phy-supply = <&vcc5v0_host>;
-};
-
-
-&combphy2_psu {
     status = "okay";
 };
 
-&usbhost3_0 {
+&u2phy3_host {
     status = "okay";
 };
 
-&usbhost_dwc3_0 {
+
-    dr_mode = "host";
+&usb_host0_ehci {
     status = "okay";
 };
 
-&pinctrl {
+&usb_host0_ohci {
-        usb-typec {
+    status = "okay";
-                usbc0_int: usbc0-int {
-                        rockchip,pins = <0 27 0 &pcfg_pull_up>;
-                };
-
-                typec5v_pwren: typec5v-pwren {
-                        rockchip,pins = <1 2 0 &pcfg_pull_none>;
-                };
-
-       };
-        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
 
+&usb_host1_ehci {
+    status = "okay";
+};
+
+&usb_host1_ohci {
+    status = "okay";
+};
+# 14 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
 
 
 
@@ -14771,7 +14622,7 @@
     phy-handle = <&rgmii_phy0>;
     status = "okay";
 };
-# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 18 "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 +14658,74 @@
     phy-handle = <&rgmii_phy1>;
     status = "okay";
 };
-# 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 19 "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/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>;
+    };
+};
+
+&combphy0_ps {
+    status = "okay";
+};
+
+&combphy1_ps {
+    status = "okay";
+};
+
+&combphy2_psu {
+    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>;
+    status = "okay";
+};
+
+&pcie3x2 {
+    reset-gpios = <&gpio4 8 0>;
+    vpcie3v3-supply = <&vcc3v3_pcie30>;
+    status = "okay";
+};
+
+&pcie3x4 {
+    num-lanes = <2>;
+    reset-gpios = <&gpio4 14 0>;
+    vpcie3v3-supply = <&vcc3v3_pcie30>;
+    status = "okay";
+};
+# 22 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 68 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi" 1
 &hdmi1 {
     status = "okay";
@@ -14838,8 +14755,8 @@
         status = "okay";
         connect = <&vp1_out_hdmi1>;
 };
-# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 69 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
-# 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 94 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 / {
     model = "dr4-rk3588";
 
@@ -14875,7 +14792,7 @@
                 status = "okay";
                 compatible = "rp_power";
                 rp_not_deep_sleep = <1>;
-# 142 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 146 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
                 usb-host-power {
                         gpio_num = <&gpio2 17 0>;
                         gpio_function = <4>;
@@ -14900,55 +14817,55 @@
 
 
 &uart0 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart0m0_xfer>;
 };
 
 &uart1 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart1m1_xfer>;
 };
 
 &uart3 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart3m0_xfer>;
 };
 
 &uart4 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart4m1_xfer>;
 };
 
 &uart5 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart5m0_xfer>;
 };
 
 &uart6 {
-    status = "okay";
+    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 = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart9m2_xfer>;
 };

rk3588/dr4-rk3588.dts

@@ -8,14 +8,18 @@
 #include "rpdzkj_config.dtsi"
 
 /* usb */
-#include "rp-usb-typec-rk3588.dtsi"
+// #include "rp-usb-typec-rk3588.dtsi"
 // #include "rp-usb-host.dtsi"
+#include "zkzg-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
@@ -163,55 +167,55 @@
 
 
 &uart0 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart0m0_xfer>;
 };
 
 &uart1 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart1m1_xfer>;
 };
 
 &uart3 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart3m0_xfer>;
 };
 
 &uart4 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart4m1_xfer>;
 };
 
 &uart5 {
-    status = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart5m0_xfer>;
 };
 
 &uart6 {
-    status = "okay";
+    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 = "okay";
+    status = "disabled";
     pinctrl-names = "default";
     pinctrl-0 = <&uart9m2_xfer>;
 };

rk3588/zkzg-pcie.dtsi

@@ -0,0 +1,62 @@
+/ {
+    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";
+};

rk3588/zkzg-usb-host.dtsi

@@ -0,0 +1,24 @@
+&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";
+};