diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
index d5041c2c41ac..bde427195d90 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
@@ -15,6 +15,8 @@
        target = <&uart2>;
        __overlay__ {
            status = "okay";
+           pinctrl-names = "default";
+           pinctrl-0 = <&uart2_xfer>;
        };
    };
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 6910db35eca0..8410358cd980 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -478,7 +478,7 @@
        dmas = <&dmac0 6>, <&dmac0 7>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";
-       pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;
+       pinctrl-0 = <&uart1_xfer>;
        status = "disabled";
    };

@@ -493,7 +493,7 @@
        dmas = <&dmac0 8>, <&dmac0 9>;
        dma-names = "tx", "rx";
        pinctrl-names = "default";
-       pinctrl-0 = <&uart2m0_xfer>;
+       pinctrl-0 = <&uart2_xfer>;
        status = "disabled";
    };

@@ -1864,6 +1864,7 @@
                    <1 RK_PD0 1 &pcfg_pull_up>;
            };

+/*
            uart1_cts: uart1-cts {
                rockchip,pins =
                    <1 RK_PC6 1 &pcfg_pull_none>;
@@ -1873,10 +1874,11 @@
                rockchip,pins =
                    <1 RK_PC7 1 &pcfg_pull_none>;
            };
+*/
        };

-       uart2-m0 {
-           uart2m0_xfer: uart2m0-xfer {
+       uart2 {
+           uart2_xfer: uart2-xfer {
                rockchip,pins =
                    <1 RK_PC7 2 &pcfg_pull_up>,
                    <1 RK_PC6 2 &pcfg_pull_up>;
diff --git a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
index 183811ba9b0e..b3e81c7f798d 100644
--- a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
@@ -142,7 +142,7 @@
        pinctrl-0 = <&otg_vbus_drv>;
        regulator-name = "vcc_otg_vbus";
    };
-
+/*
    wireless-bluetooth {
        compatible = "bluetooth-platdata";
        uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
@@ -166,6 +166,7 @@
        WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
        status = "okay";
    };
+*/

    gpio-leds {
        compatible = "gpio-leds";