取消触摸屏对IO的占用

取消一些不用的串口、添加SPI3
SDMMC占用了GPIO4_D0-5，还是没有解决GPIO不受控问题
2025-06-23 10:44:38 +08:00 · 2025-06-18 16:57:01 +08:00 · 2025-04-29 15:28:09 +08:00 · 2025-04-29 10:39:53 +08:00 · 2025-04-28 13:45:15 +08:00
10 changed files with 183 additions and 428 deletions
--- a/rk3588/.dr4-rk3588.dtb.cmd
+++ b/rk3588/.dr4-rk3588.dtb.cmd
@@ -32,13 +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/rpdzkj_config.dtsi \
-  arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.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-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-pcie-power-rk3588.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,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/rpdzkj_config.dtsi \
- arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.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-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-pcie-power-rk3588.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
@@ -14558,8 +14545,20 @@



+# 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 +14567,6 @@
    status = "okay";
 };

-
 &usb_host0_ehci {
    status = "okay";
 };
@@ -14584,7 +14582,18 @@
 &usb_host1_ohci {
    status = "okay";
 };
-# 14 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+
+
+
+
+&usbhost3_0 {
+    status = "disabled";
+};
+
+&usbhost_dwc3_0 {
+    status = "disabled";
+};
+# 13 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2



@@ -14622,7 +14631,7 @@
    phy-handle = <&rgmii_phy0>;
    status = "okay";
 };
-# 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi" 1

 &mdio1 {
@@ -14658,105 +14667,47 @@
    phy-handle = <&rgmii_phy1>;
    status = "okay";
 };
-# 19 "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/zkzg-pcie.dtsi" 1
+# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi" 1
+
 / {
+        pcie20_avdd0v85: pcie20-avdd0v85 {
+                compatible = "regulator-fixed";
+                regulator-name = "pcie20_avdd0v85";
+                regulator-boot-on;
+                regulator-always-on;
+                regulator-min-microvolt = <850000>;
+                regulator-max-microvolt = <850000>;
+                vin-supply = <&vdd_0v85_s0>;
+        };
+
+        pcie20_avdd1v8: pcie20-avdd1v8 {
+                compatible = "regulator-fixed";
+                regulator-name = "pcie20_avdd1v8";
+                regulator-boot-on;
+                regulator-always-on;
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                vin-supply = <&avcc_1v8_s0>;
+        };
+
        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>;
+                gpios = <&gpio4 5 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";
-    pinctrl-names = "default";
-    pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd &hdmim2_tx1_scl &hdmim2_tx1_sda>;
-};
-
-&hdmi1_in_vp1 {
-    status = "okay";
-};
-
-&hdmi1_sound {
-    status = "okay";
-};
-
-&i2s6_8ch {
-        status = "okay";
-};


-&hdptxphy_hdmi1 {
-    status = "okay";
 };
-
-
-&route_hdmi1 {
-        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"
+# 21 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2
+# 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 / {
    model = "dr4-rk3588";

@@ -14785,109 +14736,67 @@
            thermal-zone = "soc-thermal";
            threshold-temp = <60000>;
            running-time = <10000>;
-            status = "disabled";
+            status = "disable";
        };

        rp_power{
                status = "okay";
                compatible = "rp_power";
                rp_not_deep_sleep = <1>;
-# 146 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
+# 142 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
                usb-host-power {
                        gpio_num = <&gpio2 17 0>;
                        gpio_function = <4>;
                };

-                usb-hub-reset {
-                        gpio_num = <&gpio3 10 0>;
-                        gpio_function = <4>;
+
+
+
+
    };
-    };
-
-        rp_gpio{
-                status = "okay";
-                compatible = "rp_gpio";
-
-                gpio3c7 {
-                        gpio_num = <&gpio3 23 0>;
-                        gpio_function = <0>;
-                };
-        };
-};
-
-
-&uart0 {
-    status = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "disabled";
-    pinctrl-names = "default";
-    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>;
+# 162 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 };

 &uart7 {
-    status = "disabled";
+ 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 = "disabled";
+ status = "okay";
 pinctrl-names = "default";
 pinctrl-0 = <&uart8m0_xfer>;
+ fifo-depth =<4096>;
+ rx-fifo-depth =<2048>;
+ tx-fifo-depth =<2048>;
+ dma-names = "tx", "rx";
 };

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

 &can0 {
 assigned-clocks = <&cru 112>;
 assigned-clock-rates = <200000000>;
-    status = "disabled";
+ status = "okay";
 pinctrl-names = "default";
 pinctrl-0 = <&can0m0_pins>;
+
 };

 &can1 {
 assigned-clocks = <&cru 114>;
 assigned-clock-rates = <200000000>;
-    status = "disabled";
+ status = "okay";
 pinctrl-names = "default";
 pinctrl-0 = <&can1m1_pins>;
 };
-
+# 225 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts"
 &i2c4 {
-    status = "disabled";
+    status = "disable";
    pinctrl-names = "default";
    pinctrl-0 = <&i2c4m1_xfer>;

@@ -14908,22 +14817,9 @@


 &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";
-};
-
-&hdptxphy_hdmi_clk0 {
-            status = "okay";
-};
-
-&hdptxphy_hdmi_clk1 {
-            status = "okay";
-};
--- a/rk3588/dr4-rk3588.dtb
+++ b/rk3588/dr4-rk3588.dtb
--- a/rk3588/dr4-rk3588.dts
+++ b/rk3588/dr4-rk3588.dts
@@ -2,15 +2,14 @@
 //#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-host.dtsi"

 /* ethernet */
 // #include "rp-eth-pcie2gmac-rk3588.dtsi"
@@ -18,10 +17,7 @@
 #include "rp-eth-gmac1.dtsi"

 /* pcie */
-#include "zkzg-pcie.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-pcie-5g.dtsi"

@@ -64,8 +60,8 @@
 //#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"

@@ -119,7 +115,7 @@
            thermal-zone = "soc-thermal";
            threshold-temp = <60000>; //60C
            running-time = <10000>; //10s
-            status = "disabled";
+            status = "disable";
        };

        rp_power{
@@ -148,96 +144,86 @@
                        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 = "disabled";
-    pinctrl-names = "default";
-    pinctrl-0 = <&uart0m0_xfer>;
-};
-
-&uart1 {
-    status = "disabled";
-    pinctrl-names = "default";
-    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>;
+        //         gpio3c7 {
+        //                 gpio_num = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;
+        //                 gpio_function = <0>;
+        //         };
+        // };
 };

 &uart7 {
-    status = "disabled";
+	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 = "disabled";
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart8m0_xfer>;
+	fifo-depth =<4096>;	
+	rx-fifo-depth =<2048>;
+	tx-fifo-depth =<2048>;
+	dma-names = "tx", "rx";
 };

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

 &can0 {
 	assigned-clocks = <&cru CLK_CAN0>;
 	assigned-clock-rates = <200000000>;
-    status = "disabled";
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&can0m0_pins>;
+	
 };

 &can1 {
 	assigned-clocks = <&cru CLK_CAN1>;
 	assigned-clock-rates = <200000000>;
-    status = "disabled";
+	status = "okay";
 	pinctrl-names = "default";
 	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 = "disabled";
+    status = "disable";
    pinctrl-names = "default";
    pinctrl-0 = <&i2c4m1_xfer>;

@@ -258,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";
+// };
--- 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	eb489d7a41	取消触摸屏对IO的占用	2025-06-23 10:44:38 +08:00
zhangpeng	d93093af17	取消一些不用的串口、添加SPI3	2025-06-18 16:57:01 +08:00
zhangpeng	d0ceaee5c9	SDMMC占用了GPIO4_D0-5，还是没有解决GPIO不受控问题	2025-04-29 15:28:09 +08:00
zhangpeng	1c3ffd507a	NPU电源通信I2C被CAN2m1占用，禁用CAN2m1，硬件取消CAN芯片，测试NPU成功	2025-04-29 10:39:53 +08:00
zhangpeng	3ef84ea7c2	除了NPU，其他ok	2025-04-28 13:45:15 +08:00