diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts
index d418e022873e..fe2ecfed9bea 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-v22.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 
 #include "rk3588-vehicle-evb-v21.dtsi"
+#include "rk3588-vehicle-evb-v22-nca9539-io-expander.dtsi"
 #include "rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi"
 #include "rk3588-vehicle-serdes-mfd-display-rohm.dtsi"
 #include "rk3588-android.dtsi"
@@ -61,7 +62,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 0 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 0 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -77,7 +78,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 1 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 1 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -93,7 +94,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 2 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 2 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -109,7 +110,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 3 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 3 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -125,7 +126,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 4 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 4 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -141,7 +142,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 5 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 5 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -156,7 +157,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 6 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 6 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc12v_dcin>;
@@ -173,7 +174,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 7 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 7 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc12v_dcin>;
@@ -190,7 +191,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 8 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 8 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc12v_dcin>;
@@ -207,7 +208,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 9 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 9 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc12v_dcin>;
@@ -225,7 +226,7 @@
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 10 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 10 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc5v0_usb>;
@@ -239,7 +240,7 @@
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 11 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 11 GPIO_ACTIVE_HIGH>;
 		startup-delay-us = <2000>;
 		off-on-delay-us = <16000>;
 		vin-supply = <&vcc5v0_usb>;
@@ -253,7 +254,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 12 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 12 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc12v_dcin>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -269,7 +270,7 @@
 		regulator-min-microvolt = <12000000>;
 		regulator-max-microvolt = <12000000>;
 		enable-active-high;
-		gpio = <&i2c5_nca9539_gpio 13 GPIO_ACTIVE_HIGH>;
+		gpio = <&nca9539_gpio 13 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc5v0_usb>;
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -398,36 +399,6 @@
 		interrupt-parent = <&gpio1>;
 		interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>;
 	};
-
-	i2c5_nca9539: i2c5-nca9539@74 {
-		compatible = "novo,nca9539";
-		reg = <0x74>;
-		status = "okay";
-
-		/* P00-P07 P10-P17 output HIGH level default*/
-		serdes-init-sequence = [
-			0002 00ff
-			0003 00ff
-			0004 0000
-			0005 0000
-			0006 0000
-			0007 0000
-		];
-
-		i2c5_nca9539_pinctrl: i2c5-nca9539-pinctrl {
-			compatible = "novo,nca9539-pinctrl";
-			status = "okay";
-
-			i2c5_nca9539_gpio: i2c5-nca9539-gpio {
-				compatible = "novo,nca9539-gpio";
-				status = "okay";
-
-				gpio-controller;
-				#gpio-cells = <2>;
-				gpio-ranges = <&i2c5_nca9539_pinctrl 0 256 16>;
-			};
-		};
-	};
 };
 
 &i2c5_bu18tl82 {