diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3588-cyber3588-aib.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3588-cyber3588-aib.dts
index d5a705baec..74376992b5 100644
--- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3588-cyber3588-aib.dts
+++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3588-cyber3588-aib.dts
@@ -61,11 +61,21 @@
 
 	rfkill-wlan {
 		compatible = "rfkill-gpio";
-		label = "rfkill-wlan";
+		label = "rfkill-pcie-wlan";
 		radio-type = "wlan";
 		shutdown-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
 	};
 
+	rfkill-wwan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-wwan";
+		radio-type = "wwan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wwan_disable_h>;
+		reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
+		shutdown-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	};
+
 	vcc12v_dcin: vcc12v-dcin-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc12v_dcin";
@@ -497,8 +507,6 @@
 &pcie3x2 {
 	max-link-speed = <3>;
 	num-lanes = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&wwan_rst_en &wwan_disable_h &wwan_power_off_h>;
 	reset-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
 	vpcie3v3-supply = <&vcc3v3_wwan>;
 	status = "okay";
@@ -534,17 +542,9 @@
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
-		wwan_rst_en: wwan-rst-en {
-			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>;
-		};
-
 		wwan_disable_h: wwan-disable-h {
 			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
-
-		wwan_power_off_h: wwan-power-off-h {
-			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
-		};
 	};
 
 	sata {
diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-cyber3588-aib.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-cyber3588-aib.dts
index 4e1367e92d..6f9eb36847 100644
--- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-cyber3588-aib.dts
+++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3588-cyber3588-aib.dts
@@ -66,11 +66,21 @@
 
 	rfkill-wlan {
 		compatible = "rfkill-gpio";
-		label = "rfkill-wlan";
+		label = "rfkill-pcie-wlan";
 		radio-type = "wlan";
 		shutdown-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
 	};
 
+	rfkill-wwan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-wwan";
+		radio-type = "wwan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wwan_disable_h>;
+		reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
+		shutdown-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	};
+
 	vcc12v_dcin: vcc12v-dcin-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc12v_dcin";
@@ -530,8 +540,6 @@
 &pcie3x2 {
 	max-link-speed = <3>;
 	num-lanes = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&wwan_rst_en &wwan_disable_h &wwan_power_off_h>;
 	reset-gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
 	vpcie3v3-supply = <&vcc3v3_wwan>;
 	status = "okay";
@@ -567,17 +575,9 @@
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
-		wwan_rst_en: wwan-rst-en {
-			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>;
-		};
-
 		wwan_disable_h: wwan-disable-h {
 			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
-
-		wwan_power_off_h: wwan-power-off-h {
-			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
-		};
 	};
 
 	sata {