diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
index 4d51b075d443..558e29ada5a0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
@@ -88,7 +88,7 @@
 		 * - SDIO_RESET_L_WL_REG_ON
 		 * - PDN (power down when low)
 		 */
-		reset-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; /* GPIO3_A5 */
+		reset-gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_LOW>; /* GPIO3_A5 */
 	};
 
 	es8396-sound {
@@ -150,7 +150,7 @@
 			240 241 242 243 244 245 246 247
 			248 249 250 251 252 253 254 255>;
 		default-brightness-level = <200>;
-		enable-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+		enable-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
 	};
 
 	rk_key: rockchip-key {
@@ -172,7 +172,7 @@
 		};
 
 		power-key {
-			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
 			linux,code = <116>;
 			label = "power";
 			gpio-key,wakeup;
@@ -208,8 +208,8 @@
 
 		wifi_chip_type = "rtl8723ds";
 		sdio_vref = <1800>; /*1800mv or 3300mv*/
-		WIFI,host_wake_irq = <&gpio3 6 GPIO_ACTIVE_HIGH>;
-		WIFI,vbat_gpio  = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+		WIFI,host_wake_irq = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
+		WIFI,vbat_gpio  = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 	};
 
@@ -225,7 +225,7 @@
 	vcc_host: vcc-host {
 		compatible = "regulator-fixed";
 		enable-active-low;
-		gpio = <&gpio0 3 GPIO_ACTIVE_LOW>;
+		gpio = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&host_vbus_drv>;
 		regulator-name = "vcc_host";
@@ -239,7 +239,7 @@
 		regulator-boot-on;
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
-		gpio = <&gpio2 27 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 		startup-delay-us = <70000>;
 		vin-supply = <&vcc_18>;
@@ -599,7 +599,7 @@
 		reg = <0x40>;
 		interrupt-parent = <&gpio3>;
 		interrupts = <28 IRQ_TYPE_EDGE_FALLING>;
-		power-gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;
+		power-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>;
 		touchscreen-size-x = <800>;
 		touchscreen-size-y = <1280>;
 		silead,max-fingers = <5>;
@@ -608,8 +608,8 @@
 	gt9xx: gt9xx@14 {
 		compatible = "goodix,gt9xx";
 		reg = <0x14>;
-		touch-gpio = <&gpio3 28 IRQ_TYPE_LEVEL_HIGH>;
-		reset-gpio = <&gpio3 15 GPIO_ACTIVE_LOW>;
+		touch-gpio = <&gpio3 RK_PD4 IRQ_TYPE_LEVEL_HIGH>;
+		reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
 		max-x = <1024>;
 		max-y = <600>;
 		tp-size = <910>;
@@ -625,8 +625,8 @@
 	fm1288: fm1288@60{
 		compatible = "fm1288";
 		reg = <0x60>;
-		pwd-con-gpio = <&gpio0 25 GPIO_ACTIVE_HIGH>;
-		bypass-con-gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+		pwd-con-gpio = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>;
+		bypass-con-gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 	};
 
@@ -637,8 +637,8 @@
 		reg = <0x10>;
 		clocks = <&cru SCLK_I2S_8CH_OUT>;
 		clock-names = "mclk";
-		spk-con-gpio = <&gpio2 23 GPIO_ACTIVE_HIGH>;
-		lineout-con-gpio = <&gpio0 31 GPIO_ACTIVE_HIGH>;
+		spk-con-gpio = <&gpio2 RK_PC7 GPIO_ACTIVE_HIGH>;
+		lineout-con-gpio = <&gpio0 RK_PD7 GPIO_ACTIVE_HIGH>;
 	};
 };
 
@@ -702,7 +702,7 @@
 };
 
 &dwc_control_usb {
-	otg_drv_gpio = <&gpio0 4 GPIO_ACTIVE_LOW>;
+	otg_drv_gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
 };
 
 &dsi {
@@ -713,7 +713,7 @@
 		reg = <0>;
 		power-supply = <&vcc33_lcd>;
 		backlight = <&backlight>;
-		reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
+		reset-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_LOW>;
 		prepare-delay-ms = <20>;
 		reset-delay-ms = <20>;
 		init-delay-ms = <20>;
@@ -1025,31 +1025,31 @@
 &pinctrl {
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <RK_GPIO0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <RK_GPIO3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <RK_GPIO0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_rts_gpio: uart0-rts-gpio {
-			rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <RK_GPIO2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };