diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts
index a51884b8de38..e2f4217bab5d 100644
--- a/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts
@@ -639,34 +639,34 @@
 	lcdc {
 		lcdc_rgb_pins: lcdc-rgb-pins {
 			rockchip,pins =
-				<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_DCLK */
-				<3 RK_PA1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_HSYNC */
-				<3 RK_PA2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_VSYNC */
-				<3 RK_PA3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_DEN */
-				<3 RK_PD3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D23 */
-				<3 RK_PD2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D22 */
-				<3 RK_PD1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D21 */
-				<3 RK_PD0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D20 */
-				<3 RK_PC7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D19 */
-				<3 RK_PC6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D18 */
-				<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D17 */
-				<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
-				<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
-				<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
-				<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
-				<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
-				<3 RK_PB7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D11 */
-				<3 RK_PB6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D10 */
-				<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
-				<3 RK_PB4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D8 */
-				<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
-				<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
-				<3 RK_PB1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D5 */
-				<3 RK_PB0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D4 */
-				<3 RK_PA7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D3 */
-				<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
-				<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D1 */
-				<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>; /* LCDC_D0 */
+				<3 RK_PA0 1 &pcfg_pull_none_8ma>, /* LCDC_DCLK */
+				<3 RK_PA1 1 &pcfg_pull_none_8ma>, /* LCDC_HSYNC */
+				<3 RK_PA2 1 &pcfg_pull_none_8ma>, /* LCDC_VSYNC */
+				<3 RK_PA3 1 &pcfg_pull_none_8ma>, /* LCDC_DEN */
+				<3 RK_PD3 1 &pcfg_pull_none_8ma>, /* LCDC_D23 */
+				<3 RK_PD2 1 &pcfg_pull_none_8ma>, /* LCDC_D22 */
+				<3 RK_PD1 1 &pcfg_pull_none_8ma>, /* LCDC_D21 */
+				<3 RK_PD0 1 &pcfg_pull_none_8ma>, /* LCDC_D20 */
+				<3 RK_PC7 1 &pcfg_pull_none_8ma>, /* LCDC_D19 */
+				<3 RK_PC6 1 &pcfg_pull_none_8ma>, /* LCDC_D18 */
+				<3 RK_PC5 1 &pcfg_pull_none_8ma>, /* LCDC_D17 */
+				<3 RK_PC4 1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
+				<3 RK_PC3 1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
+				<3 RK_PC2 1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
+				<3 RK_PC1 1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
+				<3 RK_PC0 1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
+				<3 RK_PB7 1 &pcfg_pull_none_8ma>, /* LCDC_D11 */
+				<3 RK_PB6 1 &pcfg_pull_none_8ma>, /* LCDC_D10 */
+				<3 RK_PB5 1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
+				<3 RK_PB4 1 &pcfg_pull_none_8ma>, /* LCDC_D8 */
+				<3 RK_PB3 1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
+				<3 RK_PB2 1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
+				<3 RK_PB1 1 &pcfg_pull_none_8ma>, /* LCDC_D5 */
+				<3 RK_PB0 1 &pcfg_pull_none_8ma>, /* LCDC_D4 */
+				<3 RK_PA7 1 &pcfg_pull_none_8ma>, /* LCDC_D3 */
+				<3 RK_PA6 1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
+				<3 RK_PA5 1 &pcfg_pull_none_8ma>, /* LCDC_D1 */
+				<3 RK_PA4 1 &pcfg_pull_none_8ma>; /* LCDC_D0 */
 		};
 
 		lcdc_sleep_pins: lcdc-sleep-pins {
@@ -715,12 +715,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi
index 7d44ecd519db..9b0b8f7b5b6c 100644
--- a/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi
@@ -784,7 +784,7 @@
 	pmic {
 		pmic_int: pmic_int {
 			rockchip,pins =
-				<0 7 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts
index 822a2228ad1b..153e04d88609 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts
@@ -527,7 +527,7 @@
 	pmic {
 		pmic_int: pmic_int {
 			rockchip,pins =
-				<0 7 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts
index ad4d16badb84..fa0a05685a3e 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts
@@ -914,12 +914,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts
index 968a2c5f0598..f7a222d0b87c 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts
@@ -603,12 +603,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts
index 91b12bac0cf1..985e7211e796 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts
@@ -603,12 +603,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
index 3537d1f475cc..964d76bbf2cf 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
@@ -650,12 +650,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
index ecb9ec61fc6d..ba9d5e33c31e 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
@@ -701,12 +701,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts
index b8fdab8a65dd..1d628e0976b7 100644
--- a/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts
@@ -831,12 +831,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi
index 6b180ed4accf..a9ff92589294 100644
--- a/arch/arm64/boot/dts/rockchip/px30.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30.dtsi
@@ -2064,32 +2064,32 @@
 		i2c0 {
 			i2c0_xfer: i2c0-xfer {
 				rockchip,pins =
-					<0 RK_PB0 RK_FUNC_1 &pcfg_pull_none_smt>,
-					<0 RK_PB1 RK_FUNC_1 &pcfg_pull_none_smt>;
+					<0 RK_PB0 1 &pcfg_pull_none_smt>,
+					<0 RK_PB1 1 &pcfg_pull_none_smt>;
 			};
 		};
 
 		i2c1 {
 			i2c1_xfer: i2c1-xfer {
 				rockchip,pins =
-					<0 RK_PC2 RK_FUNC_1 &pcfg_pull_none_smt>,
-					<0 RK_PC3 RK_FUNC_1 &pcfg_pull_none_smt>;
+					<0 RK_PC2 1 &pcfg_pull_none_smt>,
+					<0 RK_PC3 1 &pcfg_pull_none_smt>;
 			};
 		};
 
 		i2c2 {
 			i2c2_xfer: i2c2-xfer {
 				rockchip,pins =
-					<2 RK_PB7 RK_FUNC_2 &pcfg_pull_none_smt>,
-					<2 RK_PC0 RK_FUNC_2 &pcfg_pull_none_smt>;
+					<2 RK_PB7 2 &pcfg_pull_none_smt>,
+					<2 RK_PC0 2 &pcfg_pull_none_smt>;
 			};
 		};
 
 		i2c3 {
 			i2c3_xfer: i2c3-xfer {
 				rockchip,pins =
-					<1 RK_PB4 RK_FUNC_4 &pcfg_pull_none_smt>,
-					<1 RK_PB5 RK_FUNC_4 &pcfg_pull_none_smt>;
+					<1 RK_PB4 4 &pcfg_pull_none_smt>,
+					<1 RK_PB5 4 &pcfg_pull_none_smt>;
 			};
 		};
 
@@ -2101,25 +2101,25 @@
 
 			tsadc_otp_out: tsadc-otp-out {
 				rockchip,pins =
-					<0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PA6 1 &pcfg_pull_none>;
 			};
 		};
 
 		uart0 {
 			uart0_xfer: uart0-xfer {
 				rockchip,pins =
-					<0 RK_PB2 RK_FUNC_1 &pcfg_pull_up>,
-					<0 RK_PB3 RK_FUNC_1 &pcfg_pull_up>;
+					<0 RK_PB2 1 &pcfg_pull_up>,
+					<0 RK_PB3 1 &pcfg_pull_up>;
 			};
 
 			uart0_cts: uart0-cts {
 				rockchip,pins =
-					<0 RK_PB4 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PB4 1 &pcfg_pull_none>;
 			};
 
 			uart0_rts: uart0-rts {
 				rockchip,pins =
-					<0 RK_PB5 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PB5 1 &pcfg_pull_none>;
 			};
 
 			uart0_rts_gpio: uart0-rts-gpio {
@@ -2131,18 +2131,18 @@
 		uart1 {
 			uart1_xfer: uart1-xfer {
 				rockchip,pins =
-					<1 RK_PC1 RK_FUNC_1 &pcfg_pull_up>,
-					<1 RK_PC0 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC1 1 &pcfg_pull_up>,
+					<1 RK_PC0 1 &pcfg_pull_up>;
 			};
 
 			uart1_cts: uart1-cts {
 				rockchip,pins =
-					<1 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PC2 1 &pcfg_pull_none>;
 			};
 
 			uart1_rts: uart1-rts {
 				rockchip,pins =
-					<1 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PC3 1 &pcfg_pull_none>;
 			};
 
 			uart1_rts_gpio: uart1-rts-gpio {
@@ -2154,34 +2154,34 @@
 		uart2-m0 {
 			uart2m0_xfer: uart2m0-xfer {
 				rockchip,pins =
-					<1 RK_PD2 RK_FUNC_2 &pcfg_pull_up>,
-					<1 RK_PD3 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PD2 2 &pcfg_pull_up>,
+					<1 RK_PD3 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart2-m1 {
 			uart2m1_xfer: uart2m1-xfer {
 				rockchip,pins =
-					<2 RK_PB4 RK_FUNC_2 &pcfg_pull_up>,
-					<2 RK_PB6 RK_FUNC_2 &pcfg_pull_up>;
+					<2 RK_PB4 2 &pcfg_pull_up>,
+					<2 RK_PB6 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart3-m0 {
 			uart3m0_xfer: uart3m0-xfer {
 				rockchip,pins =
-					<0 RK_PC0 RK_FUNC_2 &pcfg_pull_up>,
-					<0 RK_PC1 RK_FUNC_2 &pcfg_pull_up>;
+					<0 RK_PC0 2 &pcfg_pull_up>,
+					<0 RK_PC1 2 &pcfg_pull_up>;
 			};
 
 			uart3m0_cts: uart3m0-cts {
 				rockchip,pins =
-					<0 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
+					<0 RK_PC2 2 &pcfg_pull_none>;
 			};
 
 			uart3m0_rts: uart3m0-rts {
 				rockchip,pins =
-					<0 RK_PC3 RK_FUNC_2 &pcfg_pull_none>;
+					<0 RK_PC3 2 &pcfg_pull_none>;
 			};
 
 			uart3m0_rts_gpio: uart3m0-rts-gpio {
@@ -2193,18 +2193,18 @@
 		uart3-m1 {
 			uart3m1_xfer: uart3m1-xfer {
 				rockchip,pins =
-					<1 RK_PB6 RK_FUNC_2 &pcfg_pull_up>,
-					<1 RK_PB7 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PB6 2 &pcfg_pull_up>,
+					<1 RK_PB7 2 &pcfg_pull_up>;
 			};
 
 			uart3m1_cts: uart3m1-cts {
 				rockchip,pins =
-					<1 RK_PB4 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PB4 2 &pcfg_pull_none>;
 			};
 
 			uart3m1_rts: uart3m1-rts {
 				rockchip,pins =
-					<1 RK_PB5 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PB5 2 &pcfg_pull_none>;
 			};
 
 			uart3m1_rts_gpio: uart3m1-rts-gpio {
@@ -2217,19 +2217,19 @@
 
 			uart4_xfer: uart4-xfer {
 				rockchip,pins =
-					<1 RK_PD4 RK_FUNC_2 &pcfg_pull_up>,
-					<1 RK_PD5 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PD4 2 &pcfg_pull_up>,
+					<1 RK_PD5 2 &pcfg_pull_up>;
 			};
 
 			uart4_cts: uart4-cts {
 				rockchip,pins =
-					<1 RK_PD6 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PD6 2 &pcfg_pull_none>;
 
 			};
 
 			uart4_rts: uart4-rts {
 				rockchip,pins =
-					<1 RK_PD7 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PD7 2 &pcfg_pull_none>;
 			};
 		};
 
@@ -2237,140 +2237,140 @@
 
 			uart5_xfer: uart5-xfer {
 				rockchip,pins =
-					<3 RK_PA2 RK_FUNC_4 &pcfg_pull_up>,
-					<3 RK_PA1 RK_FUNC_4 &pcfg_pull_up>;
+					<3 RK_PA2 4 &pcfg_pull_up>,
+					<3 RK_PA1 4 &pcfg_pull_up>;
 			};
 
 			uart5_cts: uart5-cts {
 				rockchip,pins =
-					<3 RK_PA3 RK_FUNC_4 &pcfg_pull_none>;
+					<3 RK_PA3 4 &pcfg_pull_none>;
 
 			};
 
 			uart5_rts: uart5-rts {
 				rockchip,pins =
-					<3 RK_PA5 RK_FUNC_4 &pcfg_pull_none>;
+					<3 RK_PA5 4 &pcfg_pull_none>;
 			};
 		};
 
 		spi0 {
 			spi0_clk: spi0-clk {
 				rockchip,pins =
-					<1 RK_PB7 RK_FUNC_3 &pcfg_pull_up_4ma>;
+					<1 RK_PB7 3 &pcfg_pull_up_4ma>;
 			};
 
 			spi0_csn: spi0-csn {
 				rockchip,pins =
-					<1 RK_PB6 RK_FUNC_3 &pcfg_pull_up_4ma>;
+					<1 RK_PB6 3 &pcfg_pull_up_4ma>;
 			};
 
 			spi0_miso: spi0-miso {
 				rockchip,pins =
-					<1 RK_PB5 RK_FUNC_3 &pcfg_pull_up_4ma>;
+					<1 RK_PB5 3 &pcfg_pull_up_4ma>;
 			};
 
 			spi0_mosi: spi0-mosi {
 				rockchip,pins =
-					<1 RK_PB4 RK_FUNC_3 &pcfg_pull_up_4ma>;
+					<1 RK_PB4 3 &pcfg_pull_up_4ma>;
 			};
 
 			spi0_clk_hs: spi0-clk-hs {
 				rockchip,pins =
-					<1 RK_PB7 RK_FUNC_3 &pcfg_pull_up_8ma>;
+					<1 RK_PB7 3 &pcfg_pull_up_8ma>;
 			};
 
 			spi0_miso_hs: spi0-miso-hs {
 				rockchip,pins =
-					<1 RK_PB5 RK_FUNC_3 &pcfg_pull_up_8ma>;
+					<1 RK_PB5 3 &pcfg_pull_up_8ma>;
 			};
 
 			spi0_mosi_hs: spi0-mosi-hs {
 				rockchip,pins =
-					<1 RK_PB4 RK_FUNC_3 &pcfg_pull_up_8ma>;
+					<1 RK_PB4 3 &pcfg_pull_up_8ma>;
 			};
 		};
 
 		spi1 {
 			spi1_clk: spi1-clk {
 				rockchip,pins =
-					<3 RK_PB7 RK_FUNC_4 &pcfg_pull_up_4ma>;
+					<3 RK_PB7 4 &pcfg_pull_up_4ma>;
 			};
 
 			spi1_csn0: spi1-csn0 {
 				rockchip,pins =
-					<3 RK_PB1 RK_FUNC_4 &pcfg_pull_up_4ma>;
+					<3 RK_PB1 4 &pcfg_pull_up_4ma>;
 			};
 
 			spi1_csn1: spi1-csn1 {
 				rockchip,pins =
-					<3 RK_PB2 RK_FUNC_2 &pcfg_pull_up_4ma>;
+					<3 RK_PB2 2 &pcfg_pull_up_4ma>;
 			};
 
 			spi1_miso: spi1-miso {
 				rockchip,pins =
-					<3 RK_PB6 RK_FUNC_4 &pcfg_pull_up_4ma>;
+					<3 RK_PB6 4 &pcfg_pull_up_4ma>;
 			};
 
 			spi1_mosi: spi1-mosi {
 				rockchip,pins =
-					<3 RK_PB4 RK_FUNC_4 &pcfg_pull_up_4ma>;
+					<3 RK_PB4 4 &pcfg_pull_up_4ma>;
 			};
 
 			spi1_clk_hs: spi1-clk-hs {
 				rockchip,pins =
-					<3 RK_PB7 RK_FUNC_4 &pcfg_pull_up_8ma>;
+					<3 RK_PB7 4 &pcfg_pull_up_8ma>;
 			};
 
 			spi1_miso_hs: spi1-miso-hs {
 				rockchip,pins =
-					<3 RK_PB6 RK_FUNC_4 &pcfg_pull_up_8ma>;
+					<3 RK_PB6 4 &pcfg_pull_up_8ma>;
 			};
 
 			spi1_mosi_hs: spi1-mosi-hs {
 				rockchip,pins =
-					<3 RK_PB4 RK_FUNC_4 &pcfg_pull_up_8ma>;
+					<3 RK_PB4 4 &pcfg_pull_up_8ma>;
 			};
 		};
 
 		pdm {
 			pdm_clk0m0: pdm-clk0m0 {
 				rockchip,pins =
-					<3 RK_PC6 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC6 2 &pcfg_pull_none>;
 			};
 
 			pdm_clk0m1: pdm-clk0m1 {
 				rockchip,pins =
-					<2 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC6 1 &pcfg_pull_none>;
 			};
 
 			pdm_clk1: pdm-clk1 {
 				rockchip,pins =
-					<3 RK_PC7 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC7 2 &pcfg_pull_none>;
 			};
 
 			pdm_sdi0m0: pdm-sdi0m0 {
 				rockchip,pins =
-					<3 RK_PD3 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PD3 2 &pcfg_pull_none>;
 			};
 
 			pdm_sdi0m1: pdm-sdi0m1 {
 				rockchip,pins =
-					<2 RK_PC5 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PC5 2 &pcfg_pull_none>;
 			};
 
 			pdm_sdi1: pdm-sdi1 {
 				rockchip,pins =
-					<3 RK_PD0 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PD0 2 &pcfg_pull_none>;
 			};
 
 			pdm_sdi2: pdm-sdi2 {
 				rockchip,pins =
-					<3 RK_PD1 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PD1 2 &pcfg_pull_none>;
 			};
 
 			pdm_sdi3: pdm-sdi3 {
 				rockchip,pins =
-					<3 RK_PD2 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PD2 2 &pcfg_pull_none>;
 			};
 
 			pdm_clk0m0_sleep: pdm-clk0m0-sleep {
@@ -2417,151 +2417,151 @@
 		i2s0 {
 			i2s0_8ch_mclk: i2s0-8ch-mclk {
 				rockchip,pins =
-					<3 RK_PC1 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC1 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sclktx: i2s0-8ch-sclktx {
 				rockchip,pins =
-					<3 RK_PC3 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC3 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sclkrx: i2s0-8ch-sclkrx {
 				rockchip,pins =
-					<3 RK_PB4 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB4 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_lrcktx: i2s0-8ch-lrcktx {
 				rockchip,pins =
-					<3 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC2 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_lrckrx: i2s0-8ch-lrckrx {
 				rockchip,pins =
-					<3 RK_PB5 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB5 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdo0: i2s0-8ch-sdo0 {
 				rockchip,pins =
-					<3 RK_PC4 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC4 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdo1: i2s0-8ch-sdo1 {
 				rockchip,pins =
-					<3 RK_PC0 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC0 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdo2: i2s0-8ch-sdo2 {
 				rockchip,pins =
-					<3 RK_PB7 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB7 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdo3: i2s0-8ch-sdo3 {
 				rockchip,pins =
-					<3 RK_PB6 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB6 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdi0: i2s0-8ch-sdi0 {
 				rockchip,pins =
-					<3 RK_PC5 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC5 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdi1: i2s0-8ch-sdi1 {
 				rockchip,pins =
-					<3 RK_PB3 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB3 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdi2: i2s0-8ch-sdi2 {
 				rockchip,pins =
-					<3 RK_PB1 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB1 2 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_sdi3: i2s0-8ch-sdi3 {
 				rockchip,pins =
-					<3 RK_PB0 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB0 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2s1 {
 			i2s1_2ch_mclk: i2s1-2ch-mclk {
 				rockchip,pins =
-					<2 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC3 1 &pcfg_pull_none>;
 			};
 
 			i2s1_2ch_sclk: i2s1-2ch-sclk {
 				rockchip,pins =
-					<2 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC2 1 &pcfg_pull_none>;
 			};
 
 			i2s1_2ch_lrck: i2s1-2ch-lrck {
 				rockchip,pins =
-					<2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC1 1 &pcfg_pull_none>;
 			};
 
 			i2s1_2ch_sdi: i2s1-2ch-sdi {
 				rockchip,pins =
-					<2 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC5 1 &pcfg_pull_none>;
 			};
 
 			i2s1_2ch_sdo: i2s1-2ch-sdo {
 				rockchip,pins =
-					<2 RK_PC4 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC4 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2s2 {
 			i2s2_2ch_mclk: i2s2-2ch-mclk {
 				rockchip,pins =
-					<3 RK_PA1 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PA1 2 &pcfg_pull_none>;
 			};
 
 			i2s2_2ch_sclk: i2s2-2ch-sclk {
 				rockchip,pins =
-					<3 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PA2 2 &pcfg_pull_none>;
 			};
 
 			i2s2_2ch_lrck: i2s2-2ch-lrck {
 				rockchip,pins =
-					<3 RK_PA3 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PA3 2 &pcfg_pull_none>;
 			};
 
 			i2s2_2ch_sdi: i2s2-2ch-sdi {
 				rockchip,pins =
-					<3 RK_PA5 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PA5 2 &pcfg_pull_none>;
 			};
 
 			i2s2_2ch_sdo: i2s2-2ch-sdo {
 				rockchip,pins =
-					<3 RK_PA7 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PA7 2 &pcfg_pull_none>;
 			};
 		};
 
 		sdmmc {
 			sdmmc_clk: sdmmc-clk {
 				rockchip,pins =
-					<1 RK_PD6 RK_FUNC_1 &pcfg_pull_none_8ma>;
+					<1 RK_PD6 1 &pcfg_pull_none_8ma>;
 			};
 
 			sdmmc_cmd: sdmmc-cmd {
 				rockchip,pins =
-					<1 RK_PD7 RK_FUNC_1 &pcfg_pull_up_8ma>;
+					<1 RK_PD7 1 &pcfg_pull_up_8ma>;
 			};
 
 			sdmmc_det: sdmmc-det {
 				rockchip,pins =
-					<0 RK_PA3 RK_FUNC_1 &pcfg_pull_up_8ma>;
+					<0 RK_PA3 1 &pcfg_pull_up_8ma>;
 			};
 
 			sdmmc_bus1: sdmmc-bus1 {
 				rockchip,pins =
-					<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_8ma>;
+					<1 RK_PD2 1 &pcfg_pull_up_8ma>;
 			};
 
 			sdmmc_bus4: sdmmc-bus4 {
 				rockchip,pins =
-					<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_8ma>,
-					<1 RK_PD3 RK_FUNC_1 &pcfg_pull_up_8ma>,
-					<1 RK_PD4 RK_FUNC_1 &pcfg_pull_up_8ma>,
-					<1 RK_PD5 RK_FUNC_1 &pcfg_pull_up_8ma>;
+					<1 RK_PD2 1 &pcfg_pull_up_8ma>,
+					<1 RK_PD3 1 &pcfg_pull_up_8ma>,
+					<1 RK_PD4 1 &pcfg_pull_up_8ma>,
+					<1 RK_PD5 1 &pcfg_pull_up_8ma>;
 			};
 
 			sdmmc_gpio: sdmmc-gpio {
@@ -2578,20 +2578,20 @@
 		sdio {
 			sdio_clk: sdio-clk {
 				rockchip,pins =
-					<1 RK_PC5 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PC5 1 &pcfg_pull_none>;
 			};
 
 			sdio_cmd: sdio-cmd {
 				rockchip,pins =
-					<1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC4 1 &pcfg_pull_up>;
 			};
 
 			sdio_bus4: sdio-bus4 {
 				rockchip,pins =
-					<1 RK_PC6 RK_FUNC_1 &pcfg_pull_up>,
-					<1 RK_PC7 RK_FUNC_1 &pcfg_pull_up>,
-					<1 RK_PD0 RK_FUNC_1 &pcfg_pull_up>,
-					<1 RK_PD1 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC6 1 &pcfg_pull_up>,
+					<1 RK_PC7 1 &pcfg_pull_up>,
+					<1 RK_PD0 1 &pcfg_pull_up>,
+					<1 RK_PD1 1 &pcfg_pull_up>;
 			};
 
 			sdio_gpio: sdio-gpio {
@@ -2608,135 +2608,135 @@
 		emmc {
 			emmc_clk: emmc-clk {
 				rockchip,pins =
-					<1 RK_PB1 RK_FUNC_2 &pcfg_pull_none_8ma>;
+					<1 RK_PB1 2 &pcfg_pull_none_8ma>;
 			};
 
 			emmc_cmd: emmc-cmd {
 				rockchip,pins =
-					<1 RK_PB2 RK_FUNC_2 &pcfg_pull_up_8ma>;
+					<1 RK_PB2 2 &pcfg_pull_up_8ma>;
 			};
 
 			emmc_pwren: emmc-pwren {
 				rockchip,pins =
-					<1 RK_PB0 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PB0 2 &pcfg_pull_none>;
 			};
 
 			emmc_rstnout: emmc-rstnout {
 				rockchip,pins =
-					<1 RK_PB3 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PB3 2 &pcfg_pull_none>;
 			};
 
 			emmc_bus1: emmc-bus1 {
 				rockchip,pins =
-					<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8ma>;
+					<1 RK_PA0 2 &pcfg_pull_up_8ma>;
 			};
 
 			emmc_bus4: emmc-bus4 {
 				rockchip,pins =
-					<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA1 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA2 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA3 RK_FUNC_2 &pcfg_pull_up_8ma>;
+					<1 RK_PA0 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA1 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA2 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA3 2 &pcfg_pull_up_8ma>;
 			};
 
 			emmc_bus8: emmc-bus8 {
 				rockchip,pins =
-					<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA1 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA2 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA3 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA4 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA5 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA6 RK_FUNC_2 &pcfg_pull_up_8ma>,
-					<1 RK_PA7 RK_FUNC_2 &pcfg_pull_up_8ma>;
+					<1 RK_PA0 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA1 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA2 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA3 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA4 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA5 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA6 2 &pcfg_pull_up_8ma>,
+					<1 RK_PA7 2 &pcfg_pull_up_8ma>;
 			};
 		};
 
 		flash {
 			flash_cs0: flash-cs0 {
 				rockchip,pins =
-					<1 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB0 1 &pcfg_pull_none>;
 			};
 
 			flash_rdy: flash-rdy {
 				rockchip,pins =
-					<1 RK_PB1 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB1 1 &pcfg_pull_none>;
 			};
 
 			flash_dqs: flash-dqs {
 				rockchip,pins =
-					<1 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB2 1 &pcfg_pull_none>;
 			};
 
 			flash_ale: flash-ale {
 				rockchip,pins =
-					<1 RK_PB3 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB3 1 &pcfg_pull_none>;
 			};
 
 			flash_cle: flash-cle {
 				rockchip,pins =
-					<1 RK_PB4 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB4 1 &pcfg_pull_none>;
 			};
 
 			flash_wrn: flash-wrn {
 				rockchip,pins =
-					<1 RK_PB5 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB5 1 &pcfg_pull_none>;
 			};
 
 			flash_csl: flash-csl {
 				rockchip,pins =
-					<1 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB6 1 &pcfg_pull_none>;
 			};
 
 			flash_rdn: flash-rdn {
 				rockchip,pins =
-					<1 RK_PB7 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB7 1 &pcfg_pull_none>;
 			};
 
 			flash_bus8: flash-bus8 {
 				rockchip,pins =
-					<1 RK_PA0 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA1 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA2 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA3 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA4 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA5 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA6 RK_FUNC_1 &pcfg_pull_up_12ma>,
-					<1 RK_PA7 RK_FUNC_1 &pcfg_pull_up_12ma>;
+					<1 RK_PA0 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA1 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA2 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA3 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA4 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA5 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA6 1 &pcfg_pull_up_12ma>,
+					<1 RK_PA7 1 &pcfg_pull_up_12ma>;
 			};
 		};
 
 		lcdc {
 			lcdc_m0_rgb_pins: lcdc-m0-rgb-pins {
 				rockchip,pins =
-					<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_DCLK */
-					<3 RK_PA1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_HSYNC */
-					<3 RK_PA2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_VSYNC */
-					<3 RK_PA3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_DEN */
-					<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
-					<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D1 */
-					<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
-					<3 RK_PA7 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D3 */
-					<3 RK_PB0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D4 */
-					<3 RK_PB1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D5 */
-					<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
-					<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
-					<3 RK_PB4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D8 */
-					<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
-					<3 RK_PB6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D10 */
-					<3 RK_PB7 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D11 */
-					<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
-					<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
-					<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
-					<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
-					<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
-					<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D17 */
-					<3 RK_PC6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D18 */
-					<3 RK_PC7 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D19 */
-					<3 RK_PD0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D20 */
-					<3 RK_PD1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D21 */
-					<3 RK_PD2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D22 */
-					<3 RK_PD3 RK_FUNC_1 &pcfg_pull_none_8ma>;	/* LCDC_D23 */
+					<3 RK_PA0 1 &pcfg_pull_none_8ma>,	/* LCDC_DCLK */
+					<3 RK_PA1 1 &pcfg_pull_none_8ma>,	/* LCDC_HSYNC */
+					<3 RK_PA2 1 &pcfg_pull_none_8ma>,	/* LCDC_VSYNC */
+					<3 RK_PA3 1 &pcfg_pull_none_8ma>,	/* LCDC_DEN */
+					<3 RK_PA4 1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
+					<3 RK_PA5 1 &pcfg_pull_none_8ma>,	/* LCDC_D1 */
+					<3 RK_PA6 1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
+					<3 RK_PA7 1 &pcfg_pull_none_8ma>,	/* LCDC_D3 */
+					<3 RK_PB0 1 &pcfg_pull_none_8ma>,	/* LCDC_D4 */
+					<3 RK_PB1 1 &pcfg_pull_none_8ma>,	/* LCDC_D5 */
+					<3 RK_PB2 1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
+					<3 RK_PB3 1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
+					<3 RK_PB4 1 &pcfg_pull_none_8ma>,	/* LCDC_D8 */
+					<3 RK_PB5 1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
+					<3 RK_PB6 1 &pcfg_pull_none_8ma>,	/* LCDC_D10 */
+					<3 RK_PB7 1 &pcfg_pull_none_8ma>,	/* LCDC_D11 */
+					<3 RK_PC0 1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
+					<3 RK_PC1 1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
+					<3 RK_PC2 1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
+					<3 RK_PC3 1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
+					<3 RK_PC4 1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
+					<3 RK_PC5 1 &pcfg_pull_none_8ma>,	/* LCDC_D17 */
+					<3 RK_PC6 1 &pcfg_pull_none_8ma>,	/* LCDC_D18 */
+					<3 RK_PC7 1 &pcfg_pull_none_8ma>,	/* LCDC_D19 */
+					<3 RK_PD0 1 &pcfg_pull_none_8ma>,	/* LCDC_D20 */
+					<3 RK_PD1 1 &pcfg_pull_none_8ma>,	/* LCDC_D21 */
+					<3 RK_PD2 1 &pcfg_pull_none_8ma>,	/* LCDC_D22 */
+					<3 RK_PD3 1 &pcfg_pull_none_8ma>;	/* LCDC_D23 */
 			};
 
 			lcdc_m0_sleep_pins: lcdc-m0-sleep-pins {
@@ -2775,56 +2775,56 @@
 		pwm0 {
 			pwm0_pin: pwm0-pin {
 				rockchip,pins =
-					<0 RK_PB7 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PB7 1 &pcfg_pull_none>;
 			};
 		};
 
 		pwm1 {
 			pwm1_pin: pwm1-pin {
 				rockchip,pins =
-					<0 RK_PC0 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PC0 1 &pcfg_pull_none>;
 			};
 		};
 
 		pwm2 {
 			pwm2_pin: pwm2-pin {
 				rockchip,pins =
-					<2 RK_PB5 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PB5 1 &pcfg_pull_none>;
 			};
 		};
 
 		pwm3 {
 			pwm3_pin: pwm3-pin {
 				rockchip,pins =
-					<0 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PC1 1 &pcfg_pull_none>;
 			};
 		};
 
 		pwm4 {
 			pwm4_pin: pwm4-pin {
 				rockchip,pins =
-					<3 RK_PC2 RK_FUNC_3 &pcfg_pull_none>;
+					<3 RK_PC2 3 &pcfg_pull_none>;
 			};
 		};
 
 		pwm5 {
 			pwm5_pin: pwm5-pin {
 				rockchip,pins =
-					<3 RK_PC3 RK_FUNC_3 &pcfg_pull_none>;
+					<3 RK_PC3 3 &pcfg_pull_none>;
 			};
 		};
 
 		pwm6 {
 			pwm6_pin: pwm6-pin {
 				rockchip,pins =
-					<3 RK_PC4 RK_FUNC_3 &pcfg_pull_none>;
+					<3 RK_PC4 3 &pcfg_pull_none>;
 			};
 		};
 
 		pwm7 {
 			pwm7_pin: pwm7-pin {
 				rockchip,pins =
-					<3 RK_PC5 RK_FUNC_3 &pcfg_pull_none>;
+					<3 RK_PC5 3 &pcfg_pull_none>;
 			};
 		};
 
@@ -2832,107 +2832,107 @@
 			rmii_pins: rmii-pins {
 				rockchip,pins =
 					/* mac_txen */
-					<2 RK_PA0 RK_FUNC_2 &pcfg_pull_none_12ma>,
+					<2 RK_PA0 2 &pcfg_pull_none_12ma>,
 					/* mac_txd1 */
-					<2 RK_PA1 RK_FUNC_2 &pcfg_pull_none_12ma>,
+					<2 RK_PA1 2 &pcfg_pull_none_12ma>,
 					/* mac_txd0 */
-					<2 RK_PA2 RK_FUNC_2 &pcfg_pull_none_12ma>,
+					<2 RK_PA2 2 &pcfg_pull_none_12ma>,
 					/* mac_rxd0 */
-					<2 RK_PA3 RK_FUNC_2 &pcfg_pull_none>,
+					<2 RK_PA3 2 &pcfg_pull_none>,
 					/* mac_rxd1 */
-					<2 RK_PA4 RK_FUNC_2 &pcfg_pull_none>,
+					<2 RK_PA4 2 &pcfg_pull_none>,
 					/* mac_rxer */
-					<2 RK_PA5 RK_FUNC_2 &pcfg_pull_none>,
+					<2 RK_PA5 2 &pcfg_pull_none>,
 					/* mac_rxdv */
-					<2 RK_PA6 RK_FUNC_2 &pcfg_pull_none>,
+					<2 RK_PA6 2 &pcfg_pull_none>,
 					/* mac_mdio */
-					<2 RK_PA7 RK_FUNC_2 &pcfg_pull_none>,
+					<2 RK_PA7 2 &pcfg_pull_none>,
 					/* mac_mdc */
-					<2 RK_PB1 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PB1 2 &pcfg_pull_none>;
 			};
 
 			mac_refclk_12ma: mac-refclk-12ma {
 				rockchip,pins =
-					<2 RK_PB2 RK_FUNC_2 &pcfg_pull_none_12ma>;
+					<2 RK_PB2 2 &pcfg_pull_none_12ma>;
 			};
 
 			mac_refclk: mac-refclk {
 				rockchip,pins =
-					<2 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PB2 2 &pcfg_pull_none>;
 			};
 		};
 
 		cif-m0 {
 			cif_clkout_m0: cif-clkout-m0 {
-				rockchip,pins = <2 RK_PB3 RK_FUNC_1 &pcfg_pull_none_12ma>;/* cif_clkout */
+				rockchip,pins = <2 RK_PB3 1 &pcfg_pull_none_12ma>;/* cif_clkout */
 			};
 
 			dvp_d2d9_m0: dvp-d2d9-m0 {
 				rockchip,pins =
-					<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
-					<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
-					<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
-					<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
-					<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
-					<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
-					<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
-					<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
-					<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
-					<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
-					<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>,/* cif_clkin */
-					<2 RK_PB3 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkout */
+					<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
+					<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
+					<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
+					<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
+					<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
+					<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
+					<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
+					<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
+					<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
+					<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
+					<2 RK_PB2 1 &pcfg_pull_none>,/* cif_clkin */
+					<2 RK_PB3 1 &pcfg_pull_none>;/* cif_clkout */
 			};
 
 			dvp_d0d1_m0: dvp-d0d1-m0 {
 				rockchip,pins =
-					<2 RK_PB4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data0 */
-					<2 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;/* cif_data1 */
+					<2 RK_PB4 1 &pcfg_pull_none>,/* cif_data0 */
+					<2 RK_PB6 1 &pcfg_pull_none>;/* cif_data1 */
 			};
 
 			dvp_d10d11_m0:d10-d11-m0 {
 				rockchip,pins =
-					<2 RK_PB7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data10 */
-					<2 RK_PC0 RK_FUNC_1 &pcfg_pull_none>;/* cif_data11 */
+					<2 RK_PB7 1 &pcfg_pull_none>,/* cif_data10 */
+					<2 RK_PC0 1 &pcfg_pull_none>;/* cif_data11 */
 			};
 		};
 
 		cif-m1 {
 			cif_clkout_m1: cif-clkout-m1 {
-				rockchip,pins = <3 RK_PD0 RK_FUNC_3 &pcfg_pull_none>;/* cif_clkout */
+				rockchip,pins = <3 RK_PD0 3 &pcfg_pull_none>;/* cif_clkout */
 			};
 
 			dvp_d2d9_m1: dvp-d2d9-m1 {
 				rockchip,pins =
-					<3 RK_PA3 RK_FUNC_3 &pcfg_pull_none>,/* cif_data2 */
-					<3 RK_PA5 RK_FUNC_3 &pcfg_pull_none>,/* cif_data3 */
-					<3 RK_PA7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data4 */
-					<3 RK_PB0 RK_FUNC_3 &pcfg_pull_none>,/* cif_data5 */
-					<3 RK_PB1 RK_FUNC_3 &pcfg_pull_none>,/* cif_data6 */
-					<3 RK_PB4 RK_FUNC_3 &pcfg_pull_none>,/* cif_data7 */
-					<3 RK_PB6 RK_FUNC_3 &pcfg_pull_none>,/* cif_data8 */
-					<3 RK_PB7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data9 */
-					<3 RK_PD1 RK_FUNC_3 &pcfg_pull_none>,/* cif_sync */
-					<3 RK_PD2 RK_FUNC_3 &pcfg_pull_none>,/* cif_href */
-					<3 RK_PD3 RK_FUNC_3 &pcfg_pull_none>,/* cif_clkin */
-					<3 RK_PD0 RK_FUNC_3 &pcfg_pull_none>;/* cif_clkout */
+					<3 RK_PA3 3 &pcfg_pull_none>,/* cif_data2 */
+					<3 RK_PA5 3 &pcfg_pull_none>,/* cif_data3 */
+					<3 RK_PA7 3 &pcfg_pull_none>,/* cif_data4 */
+					<3 RK_PB0 3 &pcfg_pull_none>,/* cif_data5 */
+					<3 RK_PB1 3 &pcfg_pull_none>,/* cif_data6 */
+					<3 RK_PB4 3 &pcfg_pull_none>,/* cif_data7 */
+					<3 RK_PB6 3 &pcfg_pull_none>,/* cif_data8 */
+					<3 RK_PB7 3 &pcfg_pull_none>,/* cif_data9 */
+					<3 RK_PD1 3 &pcfg_pull_none>,/* cif_sync */
+					<3 RK_PD2 3 &pcfg_pull_none>,/* cif_href */
+					<3 RK_PD3 3 &pcfg_pull_none>,/* cif_clkin */
+					<3 RK_PD0 3 &pcfg_pull_none>;/* cif_clkout */
 			};
 
 			dvp_d0d1_m1: dvp-d0d1-m1 {
 				rockchip,pins =
-					<3 RK_PA1 RK_FUNC_3 &pcfg_pull_none>,/* cif_data0 */
-					<3 RK_PA2 RK_FUNC_3 &pcfg_pull_none>;/* cif_data1 */
+					<3 RK_PA1 3 &pcfg_pull_none>,/* cif_data0 */
+					<3 RK_PA2 3 &pcfg_pull_none>;/* cif_data1 */
 			};
 
 			dvp_d10d11_m1:d10-d11-m1 {
 				rockchip,pins =
-					<3 RK_PC6 RK_FUNC_3 &pcfg_pull_none>,/* cif_data10 */
-					<3 RK_PC7 RK_FUNC_3 &pcfg_pull_none>;/* cif_data11 */
+					<3 RK_PC6 3 &pcfg_pull_none>,/* cif_data10 */
+					<3 RK_PC7 3 &pcfg_pull_none>;/* cif_data11 */
 			};
 		};
 
 		isp {
 			isp_prelight: isp-prelight {
-				rockchip,pins = <3 RK_PD1 RK_FUNC_4 &pcfg_pull_none>;/* ISP_PRELIGHTTRIG */
+				rockchip,pins = <3 RK_PD1 4 &pcfg_pull_none>;/* ISP_PRELIGHTTRIG */
 			};
 		};
 	};
diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
index 819bdc37ed61..47e038a57859 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
@@ -667,12 +667,12 @@
 	pmic {
 		pmic_int: pmic_int {
 			rockchip,pins =
-				<0 RK_PA1 0 &pcfg_pull_up>;
+				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		soc_slppin_gpio: soc_slppin_gpio {
 			rockchip,pins =
-				<0 RK_PA4 0 &pcfg_output_low>;
+				<0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc_slppin_slp {
@@ -682,33 +682,33 @@
 
 		vsel_gpio: vsel-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<4 RK_PC0 0 &pcfg_pull_none>;
+				<4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins = <0 RK_PB7 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart4_rts_gpio: uart4-rts-gpio {
-			rockchip,pins = <4 RK_PB7 0 &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-wlan {
 		wifi_wake_host: wifi-wake-host {
 			rockchip,pins =
-				<4 RK_PC1 0 &pcfg_pull_up>;
+				<4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi
index 07ef299dd390..3469abac4f34 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi
@@ -3016,7 +3016,7 @@
 		tsadc {
 			tsadc_otp_gpio: tsadc-otp-gpio {
 				rockchip,pins =
-					<0 RK_PA6 0 &pcfg_pull_none>;
+					<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 
 			tsadc_otp_out: tsadc-otp-out {
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts
index afe964731aff..bf6b1bae91ab 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts
@@ -604,19 +604,19 @@
 
 	buttons {
 		mic_mute: mic-mute {
-			rockchip,pins = <0 RK_PC0 0 &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 	rotary {
 		rotary_gpio: rotary-gpio {
 			rockchip,pins =
-				<2 RK_PB3 0 &pcfg_pull_none>,
-				<2 RK_PB4 0 &pcfg_pull_none>;
+				<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi
index fa4a36b5cb18..1c0e66384c16 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi
@@ -196,11 +196,11 @@
 		spi_init_cmd: spi-init-cmd {
 			rockchip,pins =
 				/* spi sdi */
-				<1 RK_PC7 0 &pcfg_pull_none>,
+				<1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
 				/* spi scl */
-				<1 RK_PD0 0 &pcfg_pull_none>,
+				<1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
 				/* spi cs */
-				<1 RK_PD1 0 &pcfg_pull_none>;
+				<1 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
index 7012fa5e53d3..86e94fdd2f9a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
@@ -721,20 +721,20 @@
 
 	buttons {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb {
 		usb_drv: usb-drv {
 			rockchip,pins =
-				<0 RK_PC5 0 &pcfg_pull_none>;
+				<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
index d62be2056808..d231878e0c20 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
@@ -771,25 +771,25 @@
 
 	buttons {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb {
 		usb_drv: usb-drv {
-			rockchip,pins = <0 RK_PC5 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-wlan {
 		wifi_wake_host: wifi-wake-host {
-			rockchip,pins = <0 RK_PA0 0 &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 17c68dabbdde..dc8216b6a04f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -1926,7 +1926,7 @@
 		tsadc {
 			tsadc_otp_gpio: tsadc-otp-gpio {
 				rockchip,pins =
-					<0 RK_PB2 0 &pcfg_pull_none>;
+					<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 
 			tsadc_otp_out: tsadc-otp-out {
@@ -1954,7 +1954,7 @@
 
 			uart0_rts_gpio: uart0-rts-gpio {
 				rockchip,pins =
-					<2 RK_PA3 0 &pcfg_pull_none>;
+					<2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 		};
 
@@ -2029,7 +2029,7 @@
 
 			uart4_rts_gpio: uart4-rts-gpio {
 				rockchip,pins =
-					<4 RK_PA7 0 &pcfg_pull_none>;
+					<4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 		};
 
@@ -2223,13 +2223,13 @@
 
 			sdmmc_gpio: sdmmc-gpio {
 				rockchip,pins =
-					<4 RK_PD0 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD1 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD2 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD3 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD4 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD5 0 &pcfg_pull_up_4ma>,
-					<4 RK_PD6 0 &pcfg_pull_up_4ma>;
+					<4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
 			};
 		};
 
@@ -2274,12 +2274,12 @@
 
 			sdio_gpio: sdio-gpio {
 				rockchip,pins =
-					<4 RK_PA0 0 &pcfg_pull_up_4ma>,
-					<4 RK_PA1 0 &pcfg_pull_up_4ma>,
-					<4 RK_PA2 0 &pcfg_pull_up_4ma>,
-					<4 RK_PA3 0 &pcfg_pull_up_4ma>,
-					<4 RK_PA4 0 &pcfg_pull_up_4ma>,
-					<4 RK_PA5 0 &pcfg_pull_up_4ma>;
+					<4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
+					<4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
index 81c3366bbddf..69af6280d7ef 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
@@ -676,25 +676,25 @@
 
 	buttons {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb {
 		usb_drv: usb-drv {
-			rockchip,pins = <0 RK_PC5 0 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <4 RK_PD6 0 &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-wlan {
 		wifi_wake_host: wifi-wake-host {
-			rockchip,pins = <2 RK_PB4 0 &pcfg_pull_up>;
+			rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi
index 8d3f80a2b790..cb283890bfce 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi
@@ -685,12 +685,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts
index 17c25cf86ae7..0cb94b99db50 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts
@@ -622,18 +622,18 @@
 	lcdc {
 		lcdc_m1_rgb_pins: lcdc-m1-rgb-pins {
 			rockchip,pins =
-				<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,		/* LCDC_DCLK */
-				<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
-				<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
-				<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
-				<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
-				<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
-				<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
-				<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
-				<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
-				<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
-				<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
-				<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>;	/* LCDC_D17 */
+				<3 RK_PA0 1 &pcfg_pull_none>,		/* LCDC_DCLK */
+				<3 RK_PA4 1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
+				<3 RK_PA6 1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
+				<3 RK_PB2 1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
+				<3 RK_PB3 1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
+				<3 RK_PB5 1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
+				<3 RK_PC0 1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
+				<3 RK_PC1 1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
+				<3 RK_PC2 1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
+				<3 RK_PC3 1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
+				<3 RK_PC4 1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
+				<3 RK_PC5 1 &pcfg_pull_none_8ma>;	/* LCDC_D17 */
 		};
 
 		lcdc_m1_sleep_pins: lcdc-m1-sleep-pins {
@@ -666,12 +666,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts
index 8ad02ab57150..4ceefa78d97d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts
@@ -1117,12 +1117,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts
index 8894c1475252..285886b4da56 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts
@@ -1132,12 +1132,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts
index f9c588e6d5e5..cb292f9c82af 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts
@@ -1119,12 +1119,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts
index b0ee44470dd6..03c68bf99744 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts
@@ -1119,12 +1119,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts
index 7f95c3954599..bf924f04fb2c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts
@@ -967,17 +967,17 @@
 	cif-pin-m0 {
 		cif_pin_m0: cif-pin-m0 {
 			rockchip,pins =
-				<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
-				<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
-				<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
-				<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
-				<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
-				<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
-				<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
-				<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
-				<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
-				<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
-				<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
+				<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
+				<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
+				<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
+				<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
+				<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
+				<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
+				<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
+				<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
+				<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
+				<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
+				<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
 		};
 	};
 
@@ -1000,12 +1000,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts
index c30d70f5a9ab..14c9e940677c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts
@@ -682,32 +682,32 @@
 	cif-pin-m0 {
 		cif_pin_m0: cif-pin-m0 {
 			rockchip,pins =
-				<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
-				<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
-				<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
-				<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
-				<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
-				<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
-				<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
-				<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
-				<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
-				<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
-				<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
+				<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
+				<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
+				<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
+				<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
+				<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
+				<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
+				<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
+				<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
+				<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
+				<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
+				<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
 		};
 
 		cif_pin_m1: cif-pin-m1 {
 			rockchip,pins =
-				<3 RK_PA3 RK_FUNC_3 &pcfg_pull_none>,/* cif_data2 */
-				<3 RK_PA5 RK_FUNC_3 &pcfg_pull_none>,/* cif_data3 */
-				<3 RK_PA7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data4 */
-				<3 RK_PB0 RK_FUNC_3 &pcfg_pull_none>,/* cif_data5 */
-				<3 RK_PB1 RK_FUNC_3 &pcfg_pull_none>,/* cif_data6 */
-				<3 RK_PB4 RK_FUNC_3 &pcfg_pull_none>,/* cif_data7 */
-				<3 RK_PB6 RK_FUNC_3 &pcfg_pull_none>,/* cif_data8 */
-				<3 RK_PB7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data9 */
-				<3 RK_PD1 RK_FUNC_3 &pcfg_pull_none>,/* cif_sync */
-				<3 RK_PD2 RK_FUNC_3 &pcfg_pull_none>,/* cif_href */
-				<3 RK_PD3 RK_FUNC_3 &pcfg_pull_none>;/* cif_clkin */
+				<3 RK_PA3 3 &pcfg_pull_none>,/* cif_data2 */
+				<3 RK_PA5 3 &pcfg_pull_none>,/* cif_data3 */
+				<3 RK_PA7 3 &pcfg_pull_none>,/* cif_data4 */
+				<3 RK_PB0 3 &pcfg_pull_none>,/* cif_data5 */
+				<3 RK_PB1 3 &pcfg_pull_none>,/* cif_data6 */
+				<3 RK_PB4 3 &pcfg_pull_none>,/* cif_data7 */
+				<3 RK_PB6 3 &pcfg_pull_none>,/* cif_data8 */
+				<3 RK_PB7 3 &pcfg_pull_none>,/* cif_data9 */
+				<3 RK_PD1 3 &pcfg_pull_none>,/* cif_sync */
+				<3 RK_PD2 3 &pcfg_pull_none>,/* cif_href */
+				<3 RK_PD3 3 &pcfg_pull_none>;/* cif_clkin */
 		};
 	};
 
@@ -724,12 +724,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts
index 67137956760e..d3df5005a33a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts
@@ -677,17 +677,17 @@
 	cif-pin-m0 {
 		cif_pin_m0: cif-pin-m0 {
 			rockchip,pins =
-				<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
-				<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
-				<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
-				<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
-				<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
-				<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
-				<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
-				<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
-				<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
-				<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
-				<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
+				<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
+				<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
+				<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
+				<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
+				<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
+				<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
+				<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
+				<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
+				<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
+				<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
+				<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
 		};
 	};
 
@@ -704,12 +704,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
index 5be9449be1ba..18ff2377437b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
@@ -744,12 +744,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA4 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA4 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3326.dtsi b/arch/arm64/boot/dts/rockchip/rk3326.dtsi
index bb9db4dc5e2b..0e99a6da94c7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3326.dtsi
@@ -34,24 +34,24 @@
 	lcdc {
 		lcdc_m1_rgb_pins: lcdc-m1-rgb-pins {
 			rockchip,pins =
-				<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_DCLK */
-				<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
-				<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
-				<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
-				<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
-				<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
-				<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
-				<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
-				<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
-				<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
-				<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
-				<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D17 */
-				<3 RK_PC6 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D18 */
-				<3 RK_PC7 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D19 */
-				<3 RK_PD0 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D20 */
-				<3 RK_PD1 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D21 */
-				<3 RK_PD2 RK_FUNC_1 &pcfg_pull_none_8ma>,	/* LCDC_D22 */
-				<3 RK_PD3 RK_FUNC_1 &pcfg_pull_none_8ma>;	/* LCDC_D23 */
+				<3 RK_PA0 1 &pcfg_pull_none_8ma>,	/* LCDC_DCLK */
+				<3 RK_PA4 1 &pcfg_pull_none_8ma>,	/* LCDC_D0 */
+				<3 RK_PA6 1 &pcfg_pull_none_8ma>,	/* LCDC_D2 */
+				<3 RK_PB2 1 &pcfg_pull_none_8ma>,	/* LCDC_D6 */
+				<3 RK_PB3 1 &pcfg_pull_none_8ma>,	/* LCDC_D7 */
+				<3 RK_PB5 1 &pcfg_pull_none_8ma>,	/* LCDC_D9 */
+				<3 RK_PC0 1 &pcfg_pull_none_8ma>,	/* LCDC_D12 */
+				<3 RK_PC1 1 &pcfg_pull_none_8ma>,	/* LCDC_D13 */
+				<3 RK_PC2 1 &pcfg_pull_none_8ma>,	/* LCDC_D14 */
+				<3 RK_PC3 1 &pcfg_pull_none_8ma>,	/* LCDC_D15 */
+				<3 RK_PC4 1 &pcfg_pull_none_8ma>,	/* LCDC_D16 */
+				<3 RK_PC5 1 &pcfg_pull_none_8ma>,	/* LCDC_D17 */
+				<3 RK_PC6 1 &pcfg_pull_none_8ma>,	/* LCDC_D18 */
+				<3 RK_PC7 1 &pcfg_pull_none_8ma>,	/* LCDC_D19 */
+				<3 RK_PD0 1 &pcfg_pull_none_8ma>,	/* LCDC_D20 */
+				<3 RK_PD1 1 &pcfg_pull_none_8ma>,	/* LCDC_D21 */
+				<3 RK_PD2 1 &pcfg_pull_none_8ma>,	/* LCDC_D22 */
+				<3 RK_PD3 1 &pcfg_pull_none_8ma>;	/* LCDC_D23 */
 		};
 
 		lcdc_m1_sleep_pins: lcdc-m1-sleep-pins {
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
index 361164e4d473..b512dd915029 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
@@ -346,7 +346,7 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 		rockchip,pins =
-			<1 18 RK_FUNC_GPIO &pcfg_pull_none>;
+			<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -365,7 +365,7 @@
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 		rockchip,pins =
-			<1 10 RK_FUNC_GPIO &pcfg_pull_none>;
+			<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
index 241194b2cd6f..2e122b711d27 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
@@ -421,7 +421,7 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 		rockchip,pins =
-			<1 18 RK_FUNC_GPIO &pcfg_pull_none>;
+			<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -440,7 +440,7 @@
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 		rockchip,pins =
-			<1 10 RK_FUNC_GPIO &pcfg_pull_none>;
+			<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
index 5c52441b2c0c..0083ad4efa43 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
@@ -427,7 +427,7 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 		rockchip,pins =
-			<1 18 RK_FUNC_GPIO &pcfg_pull_none>;
+			<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
index be3cc4d7259d..631d74def204 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
@@ -344,19 +344,19 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <2 6 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		usb20_host_drv: usb20-host-drv {
-			rockchip,pins = <0 27 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb3 {
 		usb30_host_drv: usb30-host-drv {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index d3f8d67908c5..19cdeab6e196 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1687,40 +1687,40 @@
 
 		tsp {
 			tsp_d0: tsp-d0 {
-				rockchip,pins = <3 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA4 1 &pcfg_pull_none>;
 			};
 			tsp_d1: tsp-d1 {
-				rockchip,pins = <3 RK_PA5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA5 1 &pcfg_pull_none>;
 			};
 			tsp_d2: tsp-d2 {
-				rockchip,pins = <3 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA6 1 &pcfg_pull_none>;
 			};
 			tsp_d3: tsp-d3 {
-				rockchip,pins = <3 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA7 1 &pcfg_pull_none>;
 			};
 			tsp_d4: tsp-d4 {
-				rockchip,pins = <3 RK_PB0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PB0 1 &pcfg_pull_none>;
 			};
 			tsp_d5: tsp-d5 {
-				rockchip,pins = <2 RK_PC0 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC0 3 &pcfg_pull_none>;
 			};
 			tsp_d6: tsp-d6 {
-				rockchip,pins = <2 RK_PC1 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC1 3 &pcfg_pull_none>;
 			};
 			tsp_d7: tsp-d7 {
-				rockchip,pins = <2 RK_PC2 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC2 3 &pcfg_pull_none>;
 			};
 			tsp_sync: tsp-sync {
-				rockchip,pins = <2 RK_PB7 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB7 3 &pcfg_pull_none>;
 			};
 			tsp_clk: tsp-clk {
-				rockchip,pins = <3 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA2 1 &pcfg_pull_none>;
 			};
 			tsp_fail: tsp-fail {
-				rockchip,pins = <3 RK_PA1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA1 1 &pcfg_pull_none>;
 			};
 			tsp_valid: tsp-valid {
-				rockchip,pins = <3 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA0 1 &pcfg_pull_none>;
 			};
 		};
 
@@ -2249,7 +2249,7 @@
 
 			pwm0_pin_pull_up: pwm0-pin-pull-up {
 				rockchip,pins =
-					<2 RK_PA4 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PA4 1 &pcfg_pull_up>;
 			};
 		};
 
@@ -2260,7 +2260,7 @@
 
 			pwm1_pin_pull_up: pwm1-pin-pull-up {
 				rockchip,pins =
-					<2 RK_PA5 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PA5 1 &pcfg_pull_up>;
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts
index 3e2479c2f744..7e803a8ed30c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts
@@ -25,7 +25,7 @@
 
 &cif_clkout {
 	/* cif_clkout */
-	rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
+	rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
 };
 
 &dmc {
@@ -36,24 +36,24 @@
 &isp_dvp_d2d9 {
 	rockchip,pins =
 			/* cif_data4 ... cif_data9 */
-			<1 2 RK_FUNC_1 &pcfg_pull_down>,
-			<1 3 RK_FUNC_1 &pcfg_pull_down>,
-			<1 4 RK_FUNC_1 &pcfg_pull_down>,
-			<1 5 RK_FUNC_1 &pcfg_pull_down>,
-			<1 6 RK_FUNC_1 &pcfg_pull_down>,
-			<1 7 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PA2 1 &pcfg_pull_down>,
+			<1 RK_PA3 1 &pcfg_pull_down>,
+			<1 RK_PA4 1 &pcfg_pull_down>,
+			<1 RK_PA5 1 &pcfg_pull_down>,
+			<1 RK_PA6 1 &pcfg_pull_down>,
+			<1 RK_PA7 1 &pcfg_pull_down>,
 			/* cif_sync, cif_href */
-			<1 8 RK_FUNC_1 &pcfg_pull_down>,
-			<1 9 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PB0 1 &pcfg_pull_down>,
+			<1 RK_PB1 1 &pcfg_pull_down>,
 			/* cif_clkin */
-			<1 10 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB2 1 &pcfg_pull_down>;
 };
 
 &isp_dvp_d10d11 {
 	rockchip,pins =
 			/* cif_data10, cif_data11 */
-			<1 14 RK_FUNC_1 &pcfg_pull_down>,
-			<1 15 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB6 1 &pcfg_pull_down>,
+			<1 RK_PB7 1 &pcfg_pull_down>;
 };
 
 &i2c3 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi
index 648ee673714d..4bd3905f61a1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-808.dtsi
@@ -908,57 +908,57 @@
 
 	i2s {
 		i2s_2ch_bus: i2s-2ch-bus {
-			rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
-				<2 13 RK_FUNC_1 &pcfg_pull_none>,
-				<2 14 RK_FUNC_1 &pcfg_pull_none>,
-				<2 15 RK_FUNC_1 &pcfg_pull_none>,
-				<2 16 RK_FUNC_1 &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PB4 1 &pcfg_pull_none>,
+				<2 RK_PB5 1 &pcfg_pull_none>,
+				<2 RK_PB6 1 &pcfg_pull_none>,
+				<2 RK_PB7 1 &pcfg_pull_none>,
+				<2 RK_PC0 1 &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_sleep: pmic-sleep {
-			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
 		};
 
 		pmic_int: pmic-int {
-			rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <2 17 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	ak8963 {
 		ak8963_irq_gpio: ak8963_irq_gpio {
-			rockchip,pins = <2 18 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb {
 		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA5 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index af86b2f30443..a3e0bbaaf7c5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
@@ -281,77 +281,77 @@
 &pinctrl {
 	isp {
 		cif_clkout: cif-clkout {
-			rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+			rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
 		};
 
 		isp_dvp_d2d9: isp-dvp-d2d9 {
 			rockchip,pins =
-					<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-					<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-					<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-					<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-					<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-					<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-					<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-					<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-					<1 8 RK_FUNC_1 &pcfg_pull_none>,//cif_sync
-					<1 9 RK_FUNC_1 &pcfg_pull_none>,//cif_href
-					<1 10 RK_FUNC_1 &pcfg_pull_none>,//cif_clkin
-					<1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+					<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
+					<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
+					<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+					<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+					<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+					<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
+					<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
+					<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
+					<1 RK_PB0 1 &pcfg_pull_none>,//cif_sync
+					<1 RK_PB1 1 &pcfg_pull_none>,//cif_href
+					<1 RK_PB2 1 &pcfg_pull_none>,//cif_clkin
+					<1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
 		};
 
 		isp_dvp_d0d1: isp-dvp-d0d1 {
 			rockchip,pins =
-					<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-					<1 13 RK_FUNC_1 &pcfg_pull_none>;//cif_data1
+					<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
+					<1 RK_PB5 1 &pcfg_pull_none>;//cif_data1
 		};
 
 		isp_dvp_d10d11:isp_d10d11 {
 			rockchip,pins =
-					<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-					<1 15 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+					<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
+					<1 RK_PB7 1 &pcfg_pull_none>;//cif_data11
 		};
 
 		isp_dvp_d0d7: isp-dvp-d0d7 {
 			rockchip,pins =
-					<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-					<1 13 RK_FUNC_1 &pcfg_pull_none>,//cif_data1
-					<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-					<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-					<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-					<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-					<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-					<1 5 RK_FUNC_1 &pcfg_pull_none>;//cif_data7
+					<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
+					<1 RK_PB5 1 &pcfg_pull_none>,//cif_data1
+					<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
+					<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
+					<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+					<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+					<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+					<1 RK_PA5 1 &pcfg_pull_none>;//cif_data7
 		};
 
 		isp_dvp_d4d11: isp-dvp-d4d11 {
 			rockchip,pins =
-					<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-					<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-					<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-					<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-					<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-					<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-					<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-					<1 17 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+					<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+					<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+					<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+					<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
+					<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
+					<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
+					<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
+					<1 RK_PC1 1 &pcfg_pull_none>;//cif_data11
 		};
 
 		isp_shutter: isp-shutter {
 			rockchip,pins =
-					<3 19 RK_FUNC_2 &pcfg_pull_none>, //SHUTTEREN
-					<3 22 RK_FUNC_2 &pcfg_pull_none>;//SHUTTERTRIG
+					<3 RK_PC3 2 &pcfg_pull_none>, //SHUTTEREN
+					<3 RK_PC6 2 &pcfg_pull_none>;//SHUTTERTRIG
 		};
 
 		isp_flash_trigger: isp-flash-trigger {
-			rockchip,pins = <3 20 RK_FUNC_2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
+			rockchip,pins = <3 RK_PC4 2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
 		};
 
 		isp_prelight: isp-prelight {
-			rockchip,pins = <3 21 RK_FUNC_2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
+			rockchip,pins = <3 RK_PC5 2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
 		};
 
 		isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
-			rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
+			rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
index 4de089149c50..f286ab3dc1a8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
@@ -155,60 +155,60 @@
 
 	backlight {
 		bl_en: bl-en {
-			rockchip,pins = <0 20 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	emmc {
 		emmc_bus8: emmc-bus8 {
-			rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc-clk {
-			rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;
+			rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;
 		};
 
 		emmc-cmd {
-			rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc_reset: emmc-reset {
-			rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio {
 		wifi_reg_on: wifi-reg-on {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_rst: bt-rst {
-			rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index 6b9b1ac1994c..d919d4809dbd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
@@ -234,23 +234,23 @@
 &pinctrl {
 	ir {
 		ir_int: ir-int {
-			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_sleep: pmic-sleep {
-			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
 		};
 
 		pmic_int: pmic-int {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
index fca8e87d8f52..8251f3c0d0a8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
@@ -113,34 +113,34 @@
 		haikou_pin_hog: haikou-pin-hog {
 			rockchip,pins =
 				/* LID_BTN */
-				<RK_GPIO3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
+				<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
 				/* BATLOW# */
-				<RK_GPIO0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,
+				<0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,
 				/* SLP_BTN# */
-				<RK_GPIO3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
+				<3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
 				/* BIOS_DISABLE# */
-				<RK_GPIO3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+				<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	leds {
 		led_sd_haikou: led-sd-gpio {
 			rockchip,pins =
-				<RK_GPIO0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_cd_gpio: sdmmc-cd-gpio {
 			rockchip,pins =
-				<RK_GPIO2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb_otg {
 		otg_vbus_drv: otg-vbus-drv {
 			rockchip,pins =
-				<RK_GPIO0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index 23098c13ad83..0a897ab100b8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -275,17 +275,17 @@
 	leds {
 		led_pins_module: led-module-gpio {
 			rockchip,pins =
-				<RK_GPIO2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
-				<RK_GPIO3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
+				<3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_sleep: pmic-sleep {
-			rockchip,pins = <RK_GPIO0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index 96147d93dd1d..67d741ededed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@ -227,73 +227,73 @@
 
 	emmc {
 		emmc_bus8: emmc-bus8 {
-			rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc-clk {
-			rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;
+			rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;
 		};
 
 		emmc-cmd {
-			rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc_reset: emmc-reset {
-			rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	leds {
 		stby_pwren: stby-pwren {
-			rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		led_ctl: led-ctl {
-			rockchip,pins = <3 29 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_clk: sdmmc-clk {
-			rockchip,pins = <2 9 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
+			rockchip,pins = <2 RK_PB1 1 &pcfg_pull_none_drv_8ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
-			rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <2 RK_PB2 1 &pcfg_pull_up_drv_8ma>;
 		};
 
 		sdmmc_cd: sdmmc-cd {
-			rockchip,pins = <2 11 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <2 RK_PB3 1 &pcfg_pull_up_drv_8ma>;
 		};
 
 		sdmmc_bus1: sdmmc-bus1 {
-			rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up_drv_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
-			rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-					<2 6 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-					<2 7 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-					<2 8 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up_drv_8ma>,
+					<2 RK_PA6 1 &pcfg_pull_up_drv_8ma>,
+					<2 RK_PA7 1 &pcfg_pull_up_drv_8ma>,
+					<2 RK_PB0 1 &pcfg_pull_up_drv_8ma>;
 		};
 	};
 
 	usb {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi
index 80c6ec09f980..af441623d602 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi
@@ -798,40 +798,40 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
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 4b320a43ab5c..a7b7b06fcf03 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
@@ -918,31 +918,31 @@
 &pinctrl {
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <RK_GPIO0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <RK_GPIO3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_rts_gpio: uart0-rts-gpio {
-			rockchip,pins = <RK_GPIO2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -951,7 +951,7 @@
 			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO  &pcfg_pull_down>;
 		};
 		gpio0_a3: gpio0-a3 {
-			rockchip,pins = <0 RK_PA3 RK_FUNC_3 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA3 3 &pcfg_pull_none>;
 		};
 		gpio0_c2: gpio0-c2 {
 			rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
@@ -979,12 +979,12 @@
 	};
 	i2s {
 		i2s_8ch_bus: i2s-8ch-bus {
-			rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
-					<2 13 RK_FUNC_1 &pcfg_pull_none>,
-					<2 14 RK_FUNC_1 &pcfg_pull_none>,
-					<2 15 RK_FUNC_1 &pcfg_pull_none>,
-					<2 16 RK_FUNC_1 &pcfg_pull_none>,
-					<2 18 RK_FUNC_1 &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PB4 1 &pcfg_pull_none>,
+					<2 RK_PB5 1 &pcfg_pull_none>,
+					<2 RK_PB6 1 &pcfg_pull_none>,
+					<2 RK_PB7 1 &pcfg_pull_none>,
+					<2 RK_PC0 1 &pcfg_pull_none>,
+					<2 RK_PC2 1 &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
index fc1bf078a41f..ae5dffa7ace2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
@@ -219,17 +219,17 @@
 &pinctrl {
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_sleep: pmic-sleep {
-			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
 		};
 
 		pmic_int: pmic-int {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts
index 6237b1f66487..9f60b30b5156 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts
@@ -374,76 +374,76 @@
 
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		vsel1_gpio:vsel1_gpio{
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	emmc {
 		emmc_bus8: emmc-bus8 {
-			rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc-clk {
-			rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;
+			rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;
 		};
 
 		emmc-cmd {
-			rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc_reset: emmc-reset {
-			rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	ir {
 		ir_int: ir-int {
-			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	leds {
 		stby_pwren: stby-pwren {
-			rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		led_ctl: led-ctl {
-			rockchip,pins = <3 29 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
-			rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 7452bedf1a7e..40c9854c8939 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -236,64 +236,64 @@
 
 	emmc {
 		emmc_bus8: emmc-bus8 {
-			rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
-					<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
+					<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc-clk {
-			rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;
+			rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;
 		};
 
 		emmc-cmd {
-			rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
+			rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;
 		};
 
 		emmc_reset: emmc-reset {
-			rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	ir {
 		ir_int: ir-int {
-			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	keys {
 		pwr_key: pwr-key {
-			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	leds {
 		stby_pwren: stby-pwren {
-			rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		led_ctl: led-ctl {
-			rockchip,pins = <3 29 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio {
 		wifi_reg_on: wifi-reg-on {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_rst: bt-rst {
-			rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts
index 7defd5e05407..6f0dfb7abf1d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts
@@ -648,13 +648,13 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
index 2ac4c799e45e..3a4a3a080235 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
@@ -719,22 +719,22 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		otg_vbus_drv: otg-bus-drv {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts
index 2966f79cd799..606388d14049 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts
@@ -787,19 +787,19 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts
index 36e01d64afac..b7cf526fd778 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-tablet.dts
@@ -216,7 +216,7 @@
 
 &cif_clkout {
 	/* cif_clkout */
-	rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
+	rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
 };
 
 &cpu_l0 {
@@ -812,24 +812,24 @@
 &isp_dvp_d2d9 {
 	rockchip,pins =
 			/* cif_data4 ... cif_data9 */
-			<1 2 RK_FUNC_1 &pcfg_pull_down>,
-			<1 3 RK_FUNC_1 &pcfg_pull_down>,
-			<1 4 RK_FUNC_1 &pcfg_pull_down>,
-			<1 5 RK_FUNC_1 &pcfg_pull_down>,
-			<1 6 RK_FUNC_1 &pcfg_pull_down>,
-			<1 7 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PA2 1 &pcfg_pull_down>,
+			<1 RK_PA3 1 &pcfg_pull_down>,
+			<1 RK_PA4 1 &pcfg_pull_down>,
+			<1 RK_PA5 1 &pcfg_pull_down>,
+			<1 RK_PA6 1 &pcfg_pull_down>,
+			<1 RK_PA7 1 &pcfg_pull_down>,
 			/* cif_sync, cif_href */
-			<1 8 RK_FUNC_1 &pcfg_pull_down>,
-			<1 9 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PB0 1 &pcfg_pull_down>,
+			<1 RK_PB1 1 &pcfg_pull_down>,
 			/* cif_clkin */
-			<1 10 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB2 1 &pcfg_pull_down>;
 };
 
 &isp_dvp_d10d11 {
 	rockchip,pins =
 			/* cif_data10, cif_data11 */
-			<1 14 RK_FUNC_1 &pcfg_pull_down>,
-			<1 15 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB6 1 &pcfg_pull_down>,
+			<1 RK_PB7 1 &pcfg_pull_down>;
 };
 
 &isp_mmu {
@@ -892,34 +892,34 @@
 
 	headphone {
 		hp_det: hp-det {
-			rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cm3218 {
 		cm3218_irq_gpio: cm3218-irq-gpio {
-			rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PB7 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 = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -930,19 +930,19 @@
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi
index f5797a72648e..300d2b79cd49 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi
@@ -844,46 +844,46 @@
 &pinctrl {
 	pmic {
 		pmic_int_l: pmic-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cm3218 {
 		cm3218_irq_gpio: cm3218-irq-gpio {
-			rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PB7 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 = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 83aa9bd32077..e05093972119 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -1985,493 +1985,493 @@
 
 		edp {
 			edp_hpd: edp-hpd {
-				rockchip,pins = <2 23 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC7 2 &pcfg_pull_none>;
 			};
 		};
 
 		emmc {
 			emmc_clk: emmc-clk {
-				rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none>;
 			};
 
 			emmc_cmd: emmc-cmd {
-				rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up>;
 			};
 
 			emmc_pwr: emmc-pwr {
-				rockchip,pins = <1 27 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PD3 2 &pcfg_pull_up>;
 			};
 
 			emmc_bus1: emmc-bus1 {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>;
 			};
 
 			emmc_bus4: emmc-bus4 {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
-						<1 19 RK_FUNC_2 &pcfg_pull_up>,
-						<1 20 RK_FUNC_2 &pcfg_pull_up>,
-						<1 21 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
+						<1 RK_PC3 2 &pcfg_pull_up>,
+						<1 RK_PC4 2 &pcfg_pull_up>,
+						<1 RK_PC5 2 &pcfg_pull_up>;
 			};
 
 			emmc_bus8: emmc-bus8 {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
-						<1 19 RK_FUNC_2 &pcfg_pull_up>,
-						<1 20 RK_FUNC_2 &pcfg_pull_up>,
-						<1 21 RK_FUNC_2 &pcfg_pull_up>,
-						<1 22 RK_FUNC_2 &pcfg_pull_up>,
-						<1 23 RK_FUNC_2 &pcfg_pull_up>,
-						<1 24 RK_FUNC_2 &pcfg_pull_up>,
-						<1 25 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
+						<1 RK_PC3 2 &pcfg_pull_up>,
+						<1 RK_PC4 2 &pcfg_pull_up>,
+						<1 RK_PC5 2 &pcfg_pull_up>,
+						<1 RK_PC6 2 &pcfg_pull_up>,
+						<1 RK_PC7 2 &pcfg_pull_up>,
+						<1 RK_PD0 2 &pcfg_pull_up>,
+						<1 RK_PD1 2 &pcfg_pull_up>;
 			};
 		};
 
 		gmac {
 			rgmii_pins: rgmii-pins {
-				rockchip,pins =	<3 22 RK_FUNC_1 &pcfg_pull_none>,
-						<3 24 RK_FUNC_1 &pcfg_pull_none>,
-						<3 19 RK_FUNC_1 &pcfg_pull_none>,
-						<3 8 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 9 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 10 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 14 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 28 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 13 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 15 RK_FUNC_1 &pcfg_pull_none>,
-						<3 16 RK_FUNC_1 &pcfg_pull_none>,
-						<3 17 RK_FUNC_1 &pcfg_pull_none>,
-						<3 18 RK_FUNC_1 &pcfg_pull_none>,
-						<3 25 RK_FUNC_1 &pcfg_pull_none>,
-						<3 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins =	<3 RK_PC6 1 &pcfg_pull_none>,
+						<3 RK_PD0 1 &pcfg_pull_none>,
+						<3 RK_PC3 1 &pcfg_pull_none>,
+						<3 RK_PB0 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB1 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB2 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB6 1 &pcfg_pull_none_12ma>,
+						<3 RK_PD4 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB5 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB7 1 &pcfg_pull_none>,
+						<3 RK_PC0 1 &pcfg_pull_none>,
+						<3 RK_PC1 1 &pcfg_pull_none>,
+						<3 RK_PC2 1 &pcfg_pull_none>,
+						<3 RK_PD1 1 &pcfg_pull_none>,
+						<3 RK_PC4 1 &pcfg_pull_none>;
 			};
 
 			rmii_pins: rmii-pins {
-				rockchip,pins =	<3 22 RK_FUNC_1 &pcfg_pull_none>,
-						<3 24 RK_FUNC_1 &pcfg_pull_none>,
-						<3 19 RK_FUNC_1 &pcfg_pull_none>,
-						<3 8 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 9 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 13 RK_FUNC_1 &pcfg_pull_none_12ma>,
-						<3 15 RK_FUNC_1 &pcfg_pull_none>,
-						<3 16 RK_FUNC_1 &pcfg_pull_none>,
-						<3 20 RK_FUNC_1 &pcfg_pull_none>,
-						<3 21 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins =	<3 RK_PC6 1 &pcfg_pull_none>,
+						<3 RK_PD0 1 &pcfg_pull_none>,
+						<3 RK_PC3 1 &pcfg_pull_none>,
+						<3 RK_PB0 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB1 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB5 1 &pcfg_pull_none_12ma>,
+						<3 RK_PB7 1 &pcfg_pull_none>,
+						<3 RK_PC0 1 &pcfg_pull_none>,
+						<3 RK_PC4 1 &pcfg_pull_none>,
+						<3 RK_PC5 1 &pcfg_pull_none>;
 			};
 		};
 
 		hdmi {
 			hdmi_cec: hdmi-cec {
-				rockchip,pins = <3 23 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC7 1 &pcfg_pull_none>;
 			};
 
 			hdmi_i2c_xfer: hdmi-i2c-xfer {
-				rockchip,pins = <3 26 RK_FUNC_1 &pcfg_pull_none>,
-						<3 27 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD2 1 &pcfg_pull_none>,
+						<3 RK_PD3 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c0 {
 			i2c0_xfer: i2c0-xfer {
-				rockchip,pins = <0 6 RK_FUNC_1 &pcfg_pull_none>,
-						<0 7 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>,
+						<0 RK_PA7 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c1 {
 			i2c1_xfer: i2c1-xfer {
-				rockchip,pins = <2 21 RK_FUNC_1 &pcfg_pull_none>,
-						<2 22 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC5 1 &pcfg_pull_none>,
+						<2 RK_PC6 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c2 {
 			i2c2_xfer: i2c2-xfer {
-				rockchip,pins = <0 9 RK_FUNC_2 &pcfg_pull_none>,
-						<3 31 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB1 2 &pcfg_pull_none>,
+						<3 RK_PD7 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c3 {
 			i2c3_xfer: i2c3-xfer {
-				rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none>,
-						<1 17 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none>,
+						<1 RK_PC1 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c4 {
 			i2c4_xfer: i2c4-xfer {
-				rockchip,pins = <3 24 RK_FUNC_2 &pcfg_pull_none>,
-						<3 25 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD0 2 &pcfg_pull_none>,
+						<3 RK_PD1 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c5 {
 			i2c5_xfer: i2c5-xfer {
-				rockchip,pins = <3 26 RK_FUNC_2 &pcfg_pull_none>,
-						<3 27 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD2 2 &pcfg_pull_none>,
+						<3 RK_PD3 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2s {
 			i2s_8ch_bus: i2s-8ch-bus {
-				rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
-						<2 13 RK_FUNC_1 &pcfg_pull_none>,
-						<2 14 RK_FUNC_1 &pcfg_pull_none>,
-						<2 15 RK_FUNC_1 &pcfg_pull_none>,
-						<2 16 RK_FUNC_1 &pcfg_pull_none>,
-						<2 17 RK_FUNC_1 &pcfg_pull_none>,
-						<2 18 RK_FUNC_1 &pcfg_pull_none>,
-						<2 19 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB4 1 &pcfg_pull_none>,
+						<2 RK_PB5 1 &pcfg_pull_none>,
+						<2 RK_PB6 1 &pcfg_pull_none>,
+						<2 RK_PB7 1 &pcfg_pull_none>,
+						<2 RK_PC0 1 &pcfg_pull_none>,
+						<2 RK_PC1 1 &pcfg_pull_none>,
+						<2 RK_PC2 1 &pcfg_pull_none>,
+						<2 RK_PC3 1 &pcfg_pull_none>;
 			};
 
 			i2s_8ch_mclk: i2s-8ch-mclk {
-				rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>;
 			};
 		};
 
 		pwm0 {
 			pwm0_pin: pwm0-pin {
-				rockchip,pins = <3 8 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PB0 2 &pcfg_pull_none>;
 			};
 
 			pwm0_pin_pull_down: pwm0-pin-pull-down {
-				rockchip,pins = <3 8 RK_FUNC_2 &pcfg_pull_down>;
+				rockchip,pins = <3 RK_PB0 2 &pcfg_pull_down>;
 			};
 
 			vop_pwm_pin: vop-pwm {
-				rockchip,pins = <3 8 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PB0 3 &pcfg_pull_none>;
 			};
 		};
 
 		pwm1 {
 			pwm1_pin: pwm1-pin {
-				rockchip,pins = <0 8 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PB0 2 &pcfg_pull_none>;
 			};
 
 			pwm1_pin_pull_down: pwm1-pin-pull-down {
-				rockchip,pins = <0 8 RK_FUNC_2 &pcfg_pull_down>;
+				rockchip,pins = <0 RK_PB0 2 &pcfg_pull_down>;
 			};
 		};
 
 		pwm3 {
 			pwm3_pin: pwm3-pin {
-				rockchip,pins = <3 30 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_none>;
 			};
 
 			pwm3_pin_pull_down: pwm3-pin-pull-down {
-				rockchip,pins = <3 30 RK_FUNC_3 &pcfg_pull_down>;
+				rockchip,pins = <3 RK_PD6 3 &pcfg_pull_down>;
 			};
 		};
 
 		sdio0 {
 			sdio0_bus1: sdio0-bus1 {
-				rockchip,pins = <2 28 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PD4 1 &pcfg_pull_up>;
 			};
 
 			sdio0_bus4: sdio0-bus4 {
-				rockchip,pins = <2 28 RK_FUNC_1 &pcfg_pull_up>,
-						<2 29 RK_FUNC_1 &pcfg_pull_up>,
-						<2 30 RK_FUNC_1 &pcfg_pull_up>,
-						<2 31 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PD4 1 &pcfg_pull_up>,
+						<2 RK_PD5 1 &pcfg_pull_up>,
+						<2 RK_PD6 1 &pcfg_pull_up>,
+						<2 RK_PD7 1 &pcfg_pull_up>;
 			};
 
 			sdio0_cmd: sdio0-cmd {
-				rockchip,pins = <3 0 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA0 1 &pcfg_pull_up>;
 			};
 
 			sdio0_clk: sdio0-clk {
-				rockchip,pins = <3 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PA1 1 &pcfg_pull_none>;
 			};
 
 			sdio0_cd: sdio0-cd {
-				rockchip,pins = <3 2 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA2 1 &pcfg_pull_up>;
 			};
 
 			sdio0_wp: sdio0-wp {
-				rockchip,pins = <3 3 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA3 1 &pcfg_pull_up>;
 			};
 
 			sdio0_pwr: sdio0-pwr {
-				rockchip,pins = <3 4 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA4 1 &pcfg_pull_up>;
 			};
 
 			sdio0_bkpwr: sdio0-bkpwr {
-				rockchip,pins = <3 5 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA5 1 &pcfg_pull_up>;
 			};
 
 			sdio0_int: sdio0-int {
-				rockchip,pins = <3 6 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PA6 1 &pcfg_pull_up>;
 			};
 		};
 
 		sdmmc {
 			sdmmc_clk: sdmmc-clk {
-				rockchip,pins = <2 9 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PB1 1 &pcfg_pull_none>;
 			};
 
 			sdmmc_cmd: sdmmc-cmd {
-				rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PB2 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_cd: sdmmc-cd {
-				rockchip,pins = <2 11 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PB3 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_bus1: sdmmc-bus1 {
-				rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_bus4: sdmmc-bus4 {
-				rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up>,
-						<2 6 RK_FUNC_1 &pcfg_pull_up>,
-						<2 7 RK_FUNC_1 &pcfg_pull_up>,
-						<2 8 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up>,
+						<2 RK_PA6 1 &pcfg_pull_up>,
+						<2 RK_PA7 1 &pcfg_pull_up>,
+						<2 RK_PB0 1 &pcfg_pull_up>;
 			};
 		};
 
 		spdif {
 			spdif_bus: spdif-bus {
-				rockchip,pins = <2 23 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PC7 1 &pcfg_pull_none>;
 			};
 		};
 
 		spi0 {
 			spi0_clk: spi0-clk {
-				rockchip,pins = <1 29 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PD5 2 &pcfg_pull_up>;
 			};
 			spi0_cs0: spi0-cs0 {
-				rockchip,pins = <1 24 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PD0 3 &pcfg_pull_up>;
 			};
 			spi0_cs1: spi0-cs1 {
-				rockchip,pins = <1 25 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PD1 3 &pcfg_pull_up>;
 			};
 			spi0_tx: spi0-tx {
-				rockchip,pins = <1 23 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC7 3 &pcfg_pull_up>;
 			};
 			spi0_rx: spi0-rx {
-				rockchip,pins = <1 22 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC6 3 &pcfg_pull_up>;
 			};
 		};
 
 		spi1 {
 			spi1_clk: spi1-clk {
-				rockchip,pins = <1 14 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PB6 2 &pcfg_pull_up>;
 			};
 			spi1_cs0: spi1-cs0 {
-				rockchip,pins = <1 15 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PB7 2 &pcfg_pull_up>;
 			};
 			spi1_cs1: spi1-cs1 {
-				rockchip,pins = <3 28 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD4 2 &pcfg_pull_up>;
 			};
 			spi1_rx: spi1-rx {
-				rockchip,pins = <1 16 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC0 2 &pcfg_pull_up>;
 			};
 			spi1_tx: spi1-tx {
-				rockchip,pins = <1 17 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <1 RK_PC1 2 &pcfg_pull_up>;
 			};
 		};
 
 		spi2 {
 			spi2_clk: spi2-clk {
-				rockchip,pins = <0 12 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PB4 2 &pcfg_pull_up>;
 			};
 			spi2_cs0: spi2-cs0 {
-				rockchip,pins = <0 13 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PB5 2 &pcfg_pull_up>;
 			};
 			spi2_rx: spi2-rx {
-				rockchip,pins = <0 10 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PB2 2 &pcfg_pull_up>;
 			};
 			spi2_tx: spi2-tx {
-				rockchip,pins = <0 11 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PB3 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart0 {
 			uart0_xfer: uart0-xfer {
-				rockchip,pins = <2 24 RK_FUNC_1 &pcfg_pull_up>,
-						<2 25 RK_FUNC_1 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up>,
+						<2 RK_PD1 1 &pcfg_pull_up>;
 			};
 
 			uart0_cts: uart0-cts {
-				rockchip,pins = <2 26 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PD2 1 &pcfg_pull_none>;
 			};
 
 			uart0_rts: uart0-rts {
-				rockchip,pins = <2 27 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;
 			};
 		};
 
 		uart1 {
 			uart1_xfer: uart1-xfer {
-				rockchip,pins = <0 20 RK_FUNC_3 &pcfg_pull_up>,
-						<0 21 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PC4 3 &pcfg_pull_up>,
+						<0 RK_PC5 3 &pcfg_pull_up>;
 			};
 
 			uart1_cts: uart1-cts {
-				rockchip,pins = <0 22 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PC6 3 &pcfg_pull_none>;
 			};
 
 			uart1_rts: uart1-rts {
-				rockchip,pins = <0 23 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PC7 3 &pcfg_pull_none>;
 			};
 		};
 
 		uart2 {
 			uart2_xfer: uart2-xfer {
-				rockchip,pins = <2 6 RK_FUNC_2 &pcfg_pull_up>,
-						<2 5 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <2 RK_PA6 2 &pcfg_pull_up>,
+						<2 RK_PA5 2 &pcfg_pull_up>;
 			};
 			/* no rts / cts for uart2 */
 		};
 
 		uart3 {
 			uart3_xfer: uart3-xfer {
-				rockchip,pins = <3 29 RK_FUNC_2 &pcfg_pull_up>,
-						<3 30 RK_FUNC_2 &pcfg_pull_up>;
+				rockchip,pins = <3 RK_PD5 2 &pcfg_pull_up>,
+						<3 RK_PD6 2 &pcfg_pull_up>;
 			};
 
 			uart3_cts: uart3-cts {
-				rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC0 2 &pcfg_pull_none>;
 			};
 
 			uart3_rts: uart3-rts {
-				rockchip,pins = <3 17 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <3 RK_PC1 2 &pcfg_pull_none>;
 			};
 		};
 
 		uart4 {
 			uart4_xfer: uart4-xfer {
-				rockchip,pins = <0 27 RK_FUNC_3 &pcfg_pull_up>,
-						<0 26 RK_FUNC_3 &pcfg_pull_up>;
+				rockchip,pins = <0 RK_PD3 3 &pcfg_pull_up>,
+						<0 RK_PD2 3 &pcfg_pull_up>;
 			};
 
 			uart4_cts: uart4-cts {
-				rockchip,pins = <0 24 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PD0 3 &pcfg_pull_none>;
 			};
 
 			uart4_rts: uart4-rts {
-				rockchip,pins = <0 25 RK_FUNC_3 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PD1 3 &pcfg_pull_none>;
 			};
 		};
 
 		isp {
 			cif_clkout: cif-clkout {
-				rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+				rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
 			};
 
 			isp_dvp_d2d9: isp-dvp-d2d9 {
 				rockchip,pins =
-						<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-						<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-						<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-						<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-						<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-						<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-						<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-						<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-						<1 8 RK_FUNC_1 &pcfg_pull_none>,//cif_sync
-						<1 9 RK_FUNC_1 &pcfg_pull_none>,//cif_href
-						<1 10 RK_FUNC_1 &pcfg_pull_none>,//cif_clkin
-						<1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
+						<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
+						<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
+						<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+						<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+						<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+						<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
+						<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
+						<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
+						<1 RK_PB0 1 &pcfg_pull_none>,//cif_sync
+						<1 RK_PB1 1 &pcfg_pull_none>,//cif_href
+						<1 RK_PB2 1 &pcfg_pull_none>,//cif_clkin
+						<1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
 			};
 
 			isp_dvp_d0d1: isp-dvp-d0d1 {
 				rockchip,pins =
-						<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-						<1 13 RK_FUNC_1 &pcfg_pull_none>;//cif_data1
+						<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
+						<1 RK_PB5 1 &pcfg_pull_none>;//cif_data1
 			};
 
 			isp_dvp_d10d11:isp_d10d11 {
 				rockchip,pins =
-						<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-						<1 15 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+						<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
+						<1 RK_PB7 1 &pcfg_pull_none>;//cif_data11
 			};
 
 			isp_dvp_d0d7: isp-dvp-d0d7 {
 				rockchip,pins =
-						<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
-						<1 13 RK_FUNC_1 &pcfg_pull_none>,//cif_data1
-						<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
-						<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
-						<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-						<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-						<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-						<1 5 RK_FUNC_1 &pcfg_pull_none>;//cif_data7
+						<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
+						<1 RK_PB5 1 &pcfg_pull_none>,//cif_data1
+						<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
+						<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
+						<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+						<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+						<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+						<1 RK_PA5 1 &pcfg_pull_none>;//cif_data7
 			};
 
 			isp_dvp_d4d11: isp-dvp-d4d11 {
 				rockchip,pins =
-						<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
-						<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
-						<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
-						<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
-						<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
-						<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
-						<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
-						<1 17 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
+						<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
+						<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
+						<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
+						<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
+						<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
+						<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
+						<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
+						<1 RK_PC1 1 &pcfg_pull_none>;//cif_data11
 			};
 
 			isp_shutter: isp-shutter {
 				rockchip,pins =
-						<3 19 RK_FUNC_2 &pcfg_pull_none>, //SHUTTEREN
-						<3 22 RK_FUNC_2 &pcfg_pull_none>;//SHUTTERTRIG
+						<3 RK_PC3 2 &pcfg_pull_none>, //SHUTTEREN
+						<3 RK_PC6 2 &pcfg_pull_none>;//SHUTTERTRIG
 			};
 
 			isp_flash_trigger: isp-flash-trigger {
-				rockchip,pins = <3 20 RK_FUNC_2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
+				rockchip,pins = <3 RK_PC4 2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
 			};
 
 			isp_prelight: isp-prelight {
-				rockchip,pins = <3 21 RK_FUNC_2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
+				rockchip,pins = <3 RK_PC5 2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
 			};
 
 			isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
-				rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
+				rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
 			};
 		};
 
 		lcdc {
 			lcdc_rgb_pins: lcdc-rgb-pins {
 				rockchip,pins =
-					<0 14 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D10 */
-					<0 15 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D11 */
-					<0 16 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D12 */
-					<0 17 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D13 */
-					<0 18 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D14 */
-					<0 19 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D15 */
-					<0 20 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D16 */
-					<0 21 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D17 */
-					<0 22 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D18 */
-					<0 23 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D19 */
-					<0 24 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D20 */
-					<0 25 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D21 */
-					<0 26 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D22 */
-					<0 27 RK_FUNC_1 &pcfg_pull_none>,  /* LCDC_D23 */
-					<0 31 RK_FUNC_1 &pcfg_pull_none>,  /* DCLK */
-					<0 30 RK_FUNC_1 &pcfg_pull_none>,  /* DEN */
-					<0 28 RK_FUNC_1 &pcfg_pull_none>,  /* HSYNC */
-					<0 29 RK_FUNC_1 &pcfg_pull_none>;  /* VSYNC */
+					<0 RK_PB6 1 &pcfg_pull_none>,  /* LCDC_D10 */
+					<0 RK_PB7 1 &pcfg_pull_none>,  /* LCDC_D11 */
+					<0 RK_PC0 1 &pcfg_pull_none>,  /* LCDC_D12 */
+					<0 RK_PC1 1 &pcfg_pull_none>,  /* LCDC_D13 */
+					<0 RK_PC2 1 &pcfg_pull_none>,  /* LCDC_D14 */
+					<0 RK_PC3 1 &pcfg_pull_none>,  /* LCDC_D15 */
+					<0 RK_PC4 1 &pcfg_pull_none>,  /* LCDC_D16 */
+					<0 RK_PC5 1 &pcfg_pull_none>,  /* LCDC_D17 */
+					<0 RK_PC6 1 &pcfg_pull_none>,  /* LCDC_D18 */
+					<0 RK_PC7 1 &pcfg_pull_none>,  /* LCDC_D19 */
+					<0 RK_PD0 1 &pcfg_pull_none>,  /* LCDC_D20 */
+					<0 RK_PD1 1 &pcfg_pull_none>,  /* LCDC_D21 */
+					<0 RK_PD2 1 &pcfg_pull_none>,  /* LCDC_D22 */
+					<0 RK_PD3 1 &pcfg_pull_none>,  /* LCDC_D23 */
+					<0 RK_PD7 1 &pcfg_pull_none>,  /* DCLK */
+					<0 RK_PD6 1 &pcfg_pull_none>,  /* DEN */
+					<0 RK_PD4 1 &pcfg_pull_none>,  /* HSYNC */
+					<0 RK_PD5 1 &pcfg_pull_none>;  /* VSYNC */
 			};
 
 			lcdc_sleep_pins: lcdc-sleep-pins {
 				rockchip,pins =
-					<0 14 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D10 */
-					<0 15 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D11 */
-					<0 16 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D12 */
-					<0 17 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D13 */
-					<0 18 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D14 */
-					<0 19 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D15 */
-					<0 20 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D16 */
-					<0 21 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D17 */
-					<0 22 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D18 */
-					<0 23 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D19 */
-					<0 24 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D20 */
-					<0 25 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D21 */
-					<0 26 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D22 */
-					<0 27 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D23 */
-					<0 31 RK_FUNC_GPIO &pcfg_pull_none>,  /* DCLK */
-					<0 30 RK_FUNC_GPIO &pcfg_pull_none>,  /* DEN */
-					<0 28 RK_FUNC_GPIO &pcfg_pull_none>,  /* HSYNC */
-					<0 29 RK_FUNC_GPIO &pcfg_pull_none>;  /* VSYNC */
+					<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D10 */
+					<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D11 */
+					<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D12 */
+					<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D13 */
+					<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D14 */
+					<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D15 */
+					<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D16 */
+					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D17 */
+					<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D18 */
+					<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D19 */
+					<0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D20 */
+					<0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D21 */
+					<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D22 */
+					<0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,  /* LCDC_D23 */
+					<0 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,  /* DCLK */
+					<0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,  /* DEN */
+					<0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,  /* HSYNC */
+					<0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;  /* VSYNC */
 			};
 		};
 	};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts
index d3776f77439b..2ce4ac64b064 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts
@@ -195,7 +195,7 @@
 
 &cif_clkout {
 	/* cif_clkout */
-	rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
+	rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
 };
 
 &cpu_l0 {
@@ -788,24 +788,24 @@
 &isp_dvp_d2d9 {
 	rockchip,pins =
 			/* cif_data4 ... cif_data9 */
-			<1 2 RK_FUNC_1 &pcfg_pull_down>,
-			<1 3 RK_FUNC_1 &pcfg_pull_down>,
-			<1 4 RK_FUNC_1 &pcfg_pull_down>,
-			<1 5 RK_FUNC_1 &pcfg_pull_down>,
-			<1 6 RK_FUNC_1 &pcfg_pull_down>,
-			<1 7 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PA2 1 &pcfg_pull_down>,
+			<1 RK_PA3 1 &pcfg_pull_down>,
+			<1 RK_PA4 1 &pcfg_pull_down>,
+			<1 RK_PA5 1 &pcfg_pull_down>,
+			<1 RK_PA6 1 &pcfg_pull_down>,
+			<1 RK_PA7 1 &pcfg_pull_down>,
 			/* cif_sync, cif_href */
-			<1 8 RK_FUNC_1 &pcfg_pull_down>,
-			<1 9 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PB0 1 &pcfg_pull_down>,
+			<1 RK_PB1 1 &pcfg_pull_down>,
 			/* cif_clkin */
-			<1 10 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB2 1 &pcfg_pull_down>;
 };
 
 &isp_dvp_d10d11 {
 	rockchip,pins =
 			/* cif_data10, cif_data11 */
-			<1 14 RK_FUNC_1 &pcfg_pull_down>,
-			<1 15 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB6 1 &pcfg_pull_down>,
+			<1 RK_PB7 1 &pcfg_pull_down>;
 };
 
 &isp_mmu {
@@ -863,7 +863,7 @@
 
 	headphone {
 		hp_det: hp-det {
-			rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -880,28 +880,28 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA0 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA0 2 &pcfg_pull_none>;
 		};
 
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	sc7a30 {
 		sc7a30_irq_gpio: sc7a30_irq_gpio {
-			rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	dc_det {
 		dc_irq_gpio: dc-irq-gpio {
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -934,19 +934,19 @@
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts
index 9716e549f2a0..c64fa60d9a37 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts
@@ -196,7 +196,7 @@
 
 &cif_clkout {
 	/* cif_clkout */
-	rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
+	rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
 };
 
 &cpu_l0 {
@@ -1040,24 +1040,24 @@
 &isp_dvp_d2d9 {
 	rockchip,pins =
 			/* cif_data4 ... cif_data9 */
-			<1 2 RK_FUNC_1 &pcfg_pull_down>,
-			<1 3 RK_FUNC_1 &pcfg_pull_down>,
-			<1 4 RK_FUNC_1 &pcfg_pull_down>,
-			<1 5 RK_FUNC_1 &pcfg_pull_down>,
-			<1 6 RK_FUNC_1 &pcfg_pull_down>,
-			<1 7 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PA2 1 &pcfg_pull_down>,
+			<1 RK_PA3 1 &pcfg_pull_down>,
+			<1 RK_PA4 1 &pcfg_pull_down>,
+			<1 RK_PA5 1 &pcfg_pull_down>,
+			<1 RK_PA6 1 &pcfg_pull_down>,
+			<1 RK_PA7 1 &pcfg_pull_down>,
 			/* cif_sync, cif_href */
-			<1 8 RK_FUNC_1 &pcfg_pull_down>,
-			<1 9 RK_FUNC_1 &pcfg_pull_down>,
+			<1 RK_PB0 1 &pcfg_pull_down>,
+			<1 RK_PB1 1 &pcfg_pull_down>,
 			/* cif_clkin */
-			<1 10 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB2 1 &pcfg_pull_down>;
 };
 
 &isp_dvp_d10d11 {
 	rockchip,pins =
 			/* cif_data10, cif_data11 */
-			<1 14 RK_FUNC_1 &pcfg_pull_down>,
-			<1 15 RK_FUNC_1 &pcfg_pull_down>;
+			<1 RK_PB6 1 &pcfg_pull_down>,
+			<1 RK_PB7 1 &pcfg_pull_down>;
 };
 
 &isp_mmu {
@@ -1120,7 +1120,7 @@
 
 	headphone {
 		hp_det: hp-det {
-			rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -1137,34 +1137,34 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA0 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA0 2 &pcfg_pull_none>;
 		};
 
 		vsel_gpio: vsel-gpio {
-			rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cm3218 {
 		cm3218_irq_gpio: cm3218-irq-gpio {
-			rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PB7 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 = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -1197,19 +1197,19 @@
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PA4 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 = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index ecc368e4420f..76753a98c467 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -300,39 +300,39 @@
 		cif_clkout: cif-clkout {
 			rockchip,pins =
 				/*cif_clkout*/
-				<2 11 RK_FUNC_3 &pcfg_pull_none>;
+				<2 RK_PB3 3 &pcfg_pull_none>;
 		};
 
 		isp_dvp_d0d7: isp-dvp-d0d7 {
 			rockchip,pins =
 				/*cif_data0*/
-				<2 0 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA0 3 &pcfg_pull_none>,
 				/*cif_data1*/
-				<2 1 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA1 3 &pcfg_pull_none>,
 				/*cif_data2*/
-				<2 2 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA2 3 &pcfg_pull_none>,
 				/*cif_data3*/
-				<2 3 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA3 3 &pcfg_pull_none>,
 				/*cif_data4*/
-				<2 4 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA4 3 &pcfg_pull_none>,
 				/*cif_data5*/
-				<2 5 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA5 3 &pcfg_pull_none>,
 				/*cif_data6*/
-				<2 6 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA6 3 &pcfg_pull_none>,
 				/*cif_data7*/
-				<2 7 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA7 3 &pcfg_pull_none>,
 				/*cif_sync*/
-				<2 8 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PB0 3 &pcfg_pull_none>,
 				/*cif_href*/
-				<2 9 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PB1 3 &pcfg_pull_none>,
 				/*cif_clkin*/
-				<2 10 RK_FUNC_3 &pcfg_pull_none>;
+				<2 RK_PB2 3 &pcfg_pull_none>;
 		};
 	};
 
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts
index 9cf5690487f8..c4572da2ec87 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts
@@ -52,57 +52,57 @@
 	sdio0 {
 		sdio0_bus1: sdio0-bus1 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC5 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC6 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC7 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_cmd: sdio0-cmd {
 			rockchip,pins =
-				<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PD0 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_clk: sdio0-clk {
 			rockchip,pins =
-				<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+				<2 RK_PD1 1 &pcfg_pull_none_20ma>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_18ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_8ma>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
index 726dac1f0275..1c9b884736b1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
@@ -55,64 +55,64 @@
 	sdio0 {
 		sdio0_bus1: sdio0-bus1 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC5 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC6 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC7 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_cmd: sdio0-cmd {
 			rockchip,pins =
-				<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PD0 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_clk: sdio0-clk {
 			rockchip,pins =
-				<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+				<2 RK_PD1 1 &pcfg_pull_none_20ma>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_18ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_8ma>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	compat {
 		cpt_gpio: cpt-gpio {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_output_low>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index d264ece43f93..97789e5bf1b0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -792,45 +792,45 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	gmac {
 		rgmii_sleep_pins: rgmii-sleep-pins {
 			rockchip,pins =
-				<3 15 RK_FUNC_GPIO &pcfg_output_low>;
+				<3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts
index a39ec9bebe70..343a9fc389e1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts
@@ -382,7 +382,7 @@
 &pinctrl {
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts
index 2b251548d968..72aa97affa99 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts
@@ -150,7 +150,7 @@
 &pinctrl {
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
index 37ad6a62941b..5b6b7131fdd1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
@@ -310,7 +310,7 @@
 &pinctrl {
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts
index 24d7aa411b21..8439d91dd125 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts
@@ -418,7 +418,7 @@
 &pinctrl {
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
index 4f6dd82e0461..7326096b85c6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
@@ -1266,71 +1266,71 @@
 
 	ak8963 {
 		ak8963_irq_gpio: ak8963-irq-gpio {
-			rockchip,pins = <1 0 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	charger {
 		charger_ok: charge-ok {
 			rockchip,pins =
-				<0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	i2s0 {
 		i2s0_8ch_bus: i2s0-8ch-bus {
 			rockchip,pins =
-				<3 24 RK_FUNC_1 &pcfg_pull_none>,
-				<3 26 RK_FUNC_1 &pcfg_pull_none>,
-				<3 27 RK_FUNC_1 &pcfg_pull_none>,
-				<3 28 RK_FUNC_1 &pcfg_pull_none>,
-				<3 29 RK_FUNC_1 &pcfg_pull_none>,
-				<3 30 RK_FUNC_1 &pcfg_pull_none>,
-				<3 31 RK_FUNC_1 &pcfg_pull_none>;
+				<3 RK_PD0 1 &pcfg_pull_none>,
+				<3 RK_PD2 1 &pcfg_pull_none>,
+				<3 RK_PD3 1 &pcfg_pull_none>,
+				<3 RK_PD4 1 &pcfg_pull_none>,
+				<3 RK_PD5 1 &pcfg_pull_none>,
+				<3 RK_PD6 1 &pcfg_pull_none>,
+				<3 RK_PD7 1 &pcfg_pull_none>;
 			};
 
 		i2s_8ch_mclk: i2s-8ch-mclk {
-				rockchip,pins = <4 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
 		};
 	};
 
 	i2s1 {
 		i2s1_2ch_bus: i2s1-2ch-bus {
 			rockchip,pins =
-				<4 3 RK_FUNC_1 &pcfg_pull_none>,
-				<4 5 RK_FUNC_1 &pcfg_pull_none>,
-				<4 6 RK_FUNC_1 &pcfg_pull_none>,
-				<4 7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA3 1 &pcfg_pull_none>,
+				<4 RK_PA5 1 &pcfg_pull_none>,
+				<4 RK_PA6 1 &pcfg_pull_none>,
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 11 0 &pcfg_pull_up>;
+				<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	hdmiin {
 		hdmiin_gpios: hdmiin_gpios {
 		rockchip,pins =
-				<0 13 RK_FUNC_GPIO &pcfg_pull_none>,
-				<3 25 RK_FUNC_GPIO &pcfg_pull_none>,
-				<0 2 RK_FUNC_GPIO &pcfg_pull_none>,
-				<4 4 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
+				<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,
+				<4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>,
-					<1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
+					<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <1 22 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -1352,7 +1352,7 @@
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -1364,29 +1364,29 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_reset_gpio: bt-reset-gpio {
 			rockchip,pins =
-				<0 9 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_wake_gpio: bt-wake-gpio {
 			rockchip,pins =
-				<0 4 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<2 27 RK_FUNC_GPIO &pcfg_pull_down>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
@@ -1407,21 +1407,21 @@
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<0 8 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	vcc_sd {
 		vcc_sd_h: vcc-sd-h {
 			rockchip,pins =
-				<0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usbnet {
 		usbnet_pwr_drv: usbnet-pwr-drv {
 			rockchip,pins =
-				<4 18 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
index 7d19d5db4a36..a0ce5425442b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
@@ -210,19 +210,19 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_dvs2: pmic-dvs2 {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	usb2 {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index 71f8cc516a4f..7bbeda11934e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -580,50 +580,50 @@
 &pinctrl {
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
-			rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_dvs2: pmic-dvs2 {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		fusb1_int: fusb1-int {
-			rockchip,pins = <1 24 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
index 962078081cae..0b372763031f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
@@ -298,26 +298,26 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 		bt_reset_gpio: bt-reset-gpio {
 			rockchip,pins =
-				<0 9 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 		bt_wake_gpio: bt-wake-gpio {
 			rockchip,pins =
-				<2 26 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 4 RK_FUNC_GPIO &pcfg_pull_down>;
+				<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
index 85cf0b6bdda9..5fe550c0d891 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
@@ -400,63 +400,63 @@
 	gmac {
 		rgmii_sleep_pins: rgmii-sleep-pins {
 			rockchip,pins =
-				<3 15 RK_FUNC_GPIO &pcfg_output_low>;
+				<3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_18ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_8ma>;
 		};
 	};
 
 	pcie {
 		pcie_drv: pcie-drv {
 			rockchip,pins =
-				<1 24 RK_FUNC_GPIO &pcfg_pull_none>;
+				<1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 27 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
index 49c85b05fb0c..fdab6702c2ea 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
@@ -848,79 +848,79 @@
 
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		lcd_en: lcd-en {
-			rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pcie {
 		pcie_drv: pcie-drv {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_none>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 			pcie_3g_drv: pcie-3g-drv {
 			rockchip,pins =
-				<0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pmic {
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-			<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+			<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	rt5640 {
 		rt5640_hpcon: rt5640-hpcon {
-			rockchip,pins = <4 21 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_dvs2: pmic-dvs2 {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
index 9efefdf7c7ef..f3da693dba97 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
@@ -801,85 +801,85 @@
 &pinctrl {
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		lcd_en: lcd-en {
-			rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pcie {
 		pcie_drv: pcie-drv {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_none>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 			pcie_3g_drv: pcie-3g-drv {
 			rockchip,pins =
-				<0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	pmic {
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-			<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+			<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	rt5640 {
 		rt5640_hpcon: rt5640-hpcon {
-			rockchip,pins = <4 21 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_dvs2: pmic-dvs2 {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
index d1cf404b8708..a9f4d6d7d2b7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
@@ -73,7 +73,7 @@
 &pinctrl {
 	tpm {
 		h1_int_od_l: h1-int-od-l {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
index ff81dfda3b95..f5c3b5219244 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -360,27 +360,27 @@ ap_i2c_tp: &i2c5 {
 &pinctrl {
 	discrete-regulators {
 		pp1500_en: pp1500-en {
-			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		pp1800_audio_en: pp1800-audio-en {
-			rockchip,pins = <RK_GPIO0 2 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO
 					 &pcfg_pull_down>;
 		};
 
 		pp3000_en: pp3000-en {
-			rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		pp3300_disp_en: pp3300-disp-en {
-			rockchip,pins = <RK_GPIO4 27 RK_FUNC_GPIO
+			rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		wlan_module_pd_l: wlan-module-pd-l {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO
 					 &pcfg_pull_down>;
 		};
 	};
@@ -388,10 +388,10 @@ ap_i2c_tp: &i2c5 {
 
 &wifi {
 	wifi_perst_l: wifi-perst-l {
-		rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+		rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 	};
 
 	wlan_host_wake_l: wlan-host-wake-l {
-		rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_none>;
+		rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
index ce5db0ad27d7..e8d771e2b90e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
@@ -154,7 +154,7 @@ ap_i2c_nfc: &i2c7 {
 &pinctrl {
 	discrete-regulators {
 		fp_en: fp-en {
-			rockchip,pins = <RK_GPIO1 1 RK_FUNC_GPIO
+			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 	};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
index 78fe59da7085..7a1c36e981d5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
@@ -91,28 +91,28 @@
 /* Pinctrl overrides for -r0; in same order as parent */
 
 &ec_ap_int_l {
-	rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
+	rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 };
 
 &pp1500_en {
-	rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO &pcfg_pull_none>;
+	rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
 };
 
 &pp1800_audio_en {
-	rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO
+	rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO
 			 &pcfg_pull_none>;
 };
 
 &pp3000_en {
-	rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO
+	rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO
 			 &pcfg_pull_none>;
 };
 
 &wlan_module_pd_l {
-	rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO
+	rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO
 			 &pcfg_pull_none>;
 };
 
 &sdmmc_cd_gpio {
-	rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+	rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
index 3ae059f34cb4..44b04e1606fc 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
@@ -78,7 +78,7 @@
 &pinctrl {
 	pen-eject {
 		pen_eject_l: pen-eject-l {
-			rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO
 				&pcfg_pull_up>;
 		};
 	};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
index 65637a5a4b21..3004614ce43d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
@@ -286,24 +286,24 @@ ap_i2c_dig: &i2c2 {
 	digitizer {
 		/* Has external pullup */
 		cpu1_dig_irq_l: cpu1-dig-irq-l {
-			rockchip,pins = <2 4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		/* Has external pullup */
 		cpu1_dig_pdct_l: cpu1-dig-pdct-l {
-			rockchip,pins = <2 5 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	discrete-regulators {
 		cpu3_pen_pwr_en: cpu3-pen-pwr-en {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pen {
 		cpu1_pen_eject: cpu1-pen-eject {
-			rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index c375b9287ff1..f7b5df3d9a08 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -682,29 +682,29 @@ ap_i2c_audio: &i2c8 {
 
 	backlight-enable {
 		bl_en: bl-en {
-			rockchip,pins = <1 17 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cros-ec {
 		ec_ap_int_l: ec-ap-int-l {
-			rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	discrete-regulators {
 		sd_io_pwr_en: sd-io-pwr-en {
-			rockchip,pins = <RK_GPIO2 2 RK_FUNC_GPIO
+			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		sd_pwr_1800_sel: sd-pwr-1800-sel {
-			rockchip,pins = <RK_GPIO2 28 RK_FUNC_GPIO
+			rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 
 		sd_slot_pwr_en: sd-slot-pwr-en {
-			rockchip,pins = <RK_GPIO4 29 RK_FUNC_GPIO
+			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO
 					 &pcfg_pull_none>;
 		};
 	};
@@ -712,17 +712,17 @@ ap_i2c_audio: &i2c8 {
 	codec {
 		/* Has external pullup */
 		headset_int_l: headset-int-l {
-			rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		mic_int: mic-int {
-			rockchip,pins = <1 13 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	max98357a {
 		sdmode_en: sdmode-en {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
@@ -733,7 +733,7 @@ ap_i2c_audio: &i2c8 {
 			 * to hack this as gpio, so the EP could be able to
 			 * de-assert it along and make ClockPM(CPM) work.
 			 */
-			rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -744,20 +744,20 @@ ap_i2c_audio: &i2c8 {
 		 */
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_none_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_none_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_none_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_8ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_none_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_none_8ma>;
 		};
 
 		/*
@@ -771,12 +771,12 @@ ap_i2c_audio: &i2c8 {
 		 */
 		sdmmc_cd: sdmmc-cd {
 			rockchip,pins =
-				<0 7 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		/* This is where we actually hook up CD; has external pull */
 		sdmmc_cd_gpio: sdmmc-cd-gpio {
-			rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -786,47 +786,47 @@ ap_i2c_audio: &i2c8 {
 			 * Pull down SPI1 CLK/CS/RX/TX during suspend, to
 			 * prevent leakage.
 			 */
-			rockchip,pins = <1 9 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 10 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 7 RK_FUNC_GPIO &pcfg_pull_down>,
-					<1 8 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>,
+					<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	touchscreen {
 		touch_int_l: touch-int-l {
-			rockchip,pins = <3 13 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		touch_reset_l: touch-reset-l {
-			rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	trackpad {
 		ap_i2c_tp_pu_en: ap-i2c-tp-pu-en {
-			rockchip,pins = <3 12 RK_FUNC_GPIO &pcfg_output_high>;
+			rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_output_high>;
 		};
 
 		trackpad_int_l: trackpad-int-l {
-			rockchip,pins = <1 4 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wifi: wifi {
 		wlan_module_reset_l: wlan-module-reset-l {
-			rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_host_wake_l: bt-host-wake-l {
 			/* Kevin has an external pull up, but Gru does not */
-			rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	write-protect {
 		ap_fw_wp: ap-fw-wp {
-			rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
index 9a94d26bcd48..0549701d615e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
@@ -240,67 +240,67 @@
 		cif_clkout: cif-clkout {
 			rockchip,pins =
 				/* cif_clkout */
-				<2 11 RK_FUNC_3 &pcfg_pull_none>;
+				<2 RK_PB3 3 &pcfg_pull_none>;
 		};
 
 		isp_dvp_d0d7: isp-dvp-d0d7 {
 			rockchip,pins =
-				<4 27 RK_FUNC_GPIO &pcfg_pull_none>,
+				<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
 				/* cif_clkout */
-				<2 11 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PB3 3 &pcfg_pull_none>,
 				/* cif_data0 */
-				<2 0 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA0 3 &pcfg_pull_none>,
 				/* cif_data1 */
-				<2 1 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA1 3 &pcfg_pull_none>,
 				/* cif_data2 */
-				<2 2 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA2 3 &pcfg_pull_none>,
 				/* cif_data3 */
-				<2 3 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA3 3 &pcfg_pull_none>,
 				/* cif_data4 */
-				<2 4 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA4 3 &pcfg_pull_none>,
 				/* cif_data5 */
-				<2 5 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA5 3 &pcfg_pull_none>,
 				/* cif_data6 */
-				<2 6 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA6 3 &pcfg_pull_none>,
 				/* cif_data7 */
-				<2 7 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PA7 3 &pcfg_pull_none>,
 				/* cif_sync */
-				<2 8 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PB0 3 &pcfg_pull_none>,
 				/* cif_href */
-				<2 9 RK_FUNC_3 &pcfg_pull_none>,
+				<2 RK_PB1 3 &pcfg_pull_none>,
 				/* cif_clkin */
-				<2 10 RK_FUNC_3 &pcfg_pull_none>;
+				<2 RK_PB2 3 &pcfg_pull_none>;
 		};
 
 		isp_shutter: isp-shutter {
 			rockchip,pins =
 				/* SHUTTEREN */
-				<1 1 RK_FUNC_1 &pcfg_pull_none>,
+				<1 RK_PA1 1 &pcfg_pull_none>,
 				/* SHUTTERTRIG */
-				<1 0 RK_FUNC_1 &pcfg_pull_none>;
+				<1 RK_PA0 1 &pcfg_pull_none>;
 		};
 
 		isp_flash_trigger: isp-flash-trigger {
 			/* ISP_FLASHTRIGOU */
-			rockchip,pins = <1 3 RK_FUNC_1 &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PA3 1 &pcfg_pull_none>;
 		};
 
 		isp_flash_trigger_as_gpio: isp-flash-trigger-as-gpio {
 			/* ISP_FLASHTRIGOU */
-			rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cam_pins {
 		cam0_default_pins: cam0-default-pins {
 			rockchip,pins =
-				<4 27 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 11 RK_FUNC_3 &pcfg_pull_none>;
+				<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB3 3 &pcfg_pull_none>;
 		};
 		cam0_sleep_pins: cam0-sleep-pins {
 			rockchip,pins =
-				<4 27 RK_FUNC_3 &pcfg_pull_none>,
-				<2 11 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD3 3 &pcfg_pull_none>,
+				<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 3aa12d821744..2bb1bcc058de 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -958,101 +958,101 @@
 &pinctrl {
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
-			rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_reset_gpio: bt-reset-gpio {
-			rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_wake_gpio: bt-wake-gpio {
-			rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_irq_gpio: bt-irq-gpio {
-			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		pmic_dvs2: pmic-dvs2 {
 			rockchip,pins =
-				<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	hallsensor {
 		mh248_irq_gpio: mh248-irq-gpio {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	headphone {
 		hp_det: hp-det {
-			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lsm330_a {
 		lsm330a_irq_gpio: lsm330a-irq-gpio {
-			rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	lsm330_g {
 		lsm330g_irq_gpio: lsm330g-irq-gpio {
-			rockchip,pins = <1 20 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	mpu6500 {
 		mpu6500_irq_gpio: mpu6500-irq-gpio {
-			rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	ak8963 {
 		ak8963_irq_gpio: ak8963-irq-gpio {
-			rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	cm3218 {
 		cm3218_irq_gpio: cm3218-irq-gpio {
-			rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 1 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index 1e6a71066c16..d80d6b726820 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -168,27 +168,27 @@
 		haikou_pin_hog: haikou-pin-hog {
 			rockchip,pins =
 			  /* LID_BTN */
-			  <RK_GPIO0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>,
+			  <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>,
 			  /* BATLOW# */
-			  <RK_GPIO0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>,
+			  <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>,
 			  /* SLP_BTN# */
-			  <RK_GPIO0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
+			  <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
 			  /* BIOS_DISABLE# */
-			  <RK_GPIO0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
+			  <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	leds {
 		led_sd_haikou: led-sd-gpio {
 			rockchip,pins =
-			  <RK_GPIO1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+			  <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		otg_vbus_drv: otg-vbus-drv {
 			rockchip,pins =
-			  <RK_GPIO0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+			  <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index b155f657292b..cbdd946a9881 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -413,10 +413,10 @@
  */
 &i2s0_2ch_bus {
 	rockchip,pins =
-		<RK_GPIO3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
-		<RK_GPIO3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>,
-		<RK_GPIO3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>,
-		<RK_GPIO3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>;
+		<3 RK_PD0 1 &pcfg_pull_none>,
+		<3 RK_PD2 1 &pcfg_pull_none>,
+		<3 RK_PD3 1 &pcfg_pull_none>,
+		<3 RK_PD7 1 &pcfg_pull_none>;
 };
 
 &io_domains {
@@ -440,29 +440,29 @@
 	i2c8 {
 		i2c8_xfer_a: i2c8-xfer {
 			rockchip,pins =
-			  <RK_GPIO1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>,
-			  <RK_GPIO1 RK_PC5 RK_FUNC_1 &pcfg_pull_up>;
+			  <1 RK_PC4 1 &pcfg_pull_up>,
+			  <1 RK_PC5 1 &pcfg_pull_up>;
 		};
 	};
 
 	leds {
 		led_pin_module: led-module-gpio {
 			rockchip,pins =
-			  <RK_GPIO2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+			  <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-			  <RK_GPIO1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+			  <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	usb2 {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins =
-			  <RK_GPIO4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+			  <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts
index 03a364fa4ec5..ddaf92ea1619 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts
@@ -885,109 +885,109 @@
 	sdio0 {
 		sdio0_bus1: sdio0-bus1 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins =
-				<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC5 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC6 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC7 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_cmd: sdio0-cmd {
 			rockchip,pins =
-				<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PD0 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_clk: sdio0-clk {
 			rockchip,pins =
-				<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+				<2 RK_PD1 1 &pcfg_pull_none_20ma>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_18ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_8ma>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pcie {
 		pcie_drv: pcie-drv {
 			rockchip,pins =
-				<3 11 RK_FUNC_GPIO &pcfg_pull_none>;
+				<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	gmac {
 		rgmii_sleep_pins: rgmii-sleep-pins {
 			rockchip,pins =
-				<3 15 RK_FUNC_GPIO &pcfg_output_low>;
+				<3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index cb3dcefe788b..cf055bbf3a82 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -989,50 +989,50 @@
 	sdio0 {
 		sdio0_bus1: sdio0-bus1 {
 			rockchip,pins =
-				<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins =
-				<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 RK_PC5 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 RK_PC6 RK_FUNC_1 &pcfg_pull_up_20ma>,
-				<2 RK_PC7 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PC4 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC5 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC6 1 &pcfg_pull_up_20ma>,
+				<2 RK_PC7 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_cmd: sdio0-cmd {
 			rockchip,pins =
-				<2 RK_PD0 RK_FUNC_1 &pcfg_pull_up_20ma>;
+				<2 RK_PD0 1 &pcfg_pull_up_20ma>;
 		};
 
 		sdio0_clk: sdio0-clk {
 			rockchip,pins =
-				<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none_20ma>;
+				<2 RK_PD1 1 &pcfg_pull_none_20ma>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 RK_PB1 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 RK_PB2 RK_FUNC_1 &pcfg_pull_up_8ma>,
-				<4 RK_PB3 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_8ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_8ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 RK_PB4 RK_FUNC_1 &pcfg_pull_none_18ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_18ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 RK_PB5 RK_FUNC_1 &pcfg_pull_up_8ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_8ma>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
index d8bcdde54c58..3e9ef7b0773b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
@@ -101,19 +101,19 @@
 		tc35874x_gpios: tc35874x_gpios {
 			rockchip,pins =
 				/* PWREN_3.3 */
-				<2 5 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
 				/* PWREN_1.2 */
-				<2 6 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
 				/* HDMIIN_RST */
-				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
 				/* HDMIIN_STBY */
-				<2 8 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
 				/* MIPI_RST */
-				<2 9 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
 				/* CSI_CTL */
-				<2 10 RK_FUNC_GPIO &pcfg_output_low>,
+				<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
 				/* HDMIIN_INT */
-				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
index 118121fb2cd8..8156e5f7c795 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
@@ -469,19 +469,19 @@
 &pinctrl {
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	hdmiin {
 		hdmiin_gpios: hdmiin_gpios {
 		rockchip,pins =
-				<2 5 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 6 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 8 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 9 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
index bc143d19bab4..e1e482938481 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
@@ -446,26 +446,26 @@
 &pinctrl {
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	hdmiin {
 		hdmiin_gpios: hdmiin-gpios {
 			rockchip,pins =
-				<2 5 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 6 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 8 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 9 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 10 RK_FUNC_GPIO &pcfg_output_low>,
-				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
index ed059efcc576..9f370a7bff1c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
@@ -427,26 +427,26 @@
 &pinctrl {
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	hdmiin {
 		hdmiin_gpios: hdmiin-gpios {
 			rockchip,pins =
-				<2 5 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 6 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 8 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 9 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 10 RK_FUNC_GPIO &pcfg_output_low>,
-				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts
index b69e94862665..da471a636103 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts
@@ -472,26 +472,26 @@
 &pinctrl {
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd-panel {
 		lcd_panel_reset: lcd-panel-reset {
-			rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	hdmiin {
 		hdmiin_gpios: hdmiin-gpios {
 			rockchip,pins =
-				<2 5 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 6 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 8 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 9 RK_FUNC_GPIO &pcfg_output_high>,
-				<2 10 RK_FUNC_GPIO &pcfg_output_low>,
-				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
+				<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index b5cfd5cf2fb8..c06fbbd3e05f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -538,7 +538,7 @@
 	sd {
 		sdmmc0_pwr_h: sdmmc0-pwr-h {
 			rockchip,pins =
-				<RK_GPIO0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -699,7 +699,7 @@
 &pinctrl {
 	fusb30x {
 		fusb0_int: fusb0-int {
-			rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
index 9d3fb1754de9..8eb9c399887a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -1077,34 +1077,34 @@
 &pinctrl {
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
-			rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
-			rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 
 	headphone {
 		hp_det: hp-det {
-			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -1129,7 +1129,7 @@
 	charger {
 		charger_ok: charge-ok {
 			rockchip,pins =
-				<1 23 RK_FUNC_GPIO &pcfg_pull_up>;
+				<1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
@@ -1149,7 +1149,7 @@
 	usb2 {
 		host_vbus_drv: host-vbus-drv {
 			rockchip,pins =
-				<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
+				<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
index d4218d279a79..10ba2048483d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
@@ -273,21 +273,21 @@
 &pinctrl {
 	buttons {
 		pwrbtn: pwrbtn {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index f85592123a33..ee59e6ccb497 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2477,14 +2477,14 @@
 
 		clock {
 			clk_32k: clk-32k {
-				rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
 			};
 		};
 
 		edp {
 			edp_hpd: edp-hpd {
 				rockchip,pins =
-					<4 23 RK_FUNC_2 &pcfg_pull_none>;
+					<4 RK_PC7 2 &pcfg_pull_none>;
 			};
 		};
 
@@ -2492,97 +2492,97 @@
 			rgmii_pins: rgmii-pins {
 				rockchip,pins =
 					/* mac_txclk */
-					<3 17 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PC1 1 &pcfg_pull_none_13ma>,
 					/* mac_rxclk */
-					<3 14 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB6 1 &pcfg_pull_none>,
 					/* mac_mdio */
-					<3 13 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB5 1 &pcfg_pull_none>,
 					/* mac_txen */
-					<3 12 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PB4 1 &pcfg_pull_none_13ma>,
 					/* mac_clk */
-					<3 11 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB3 1 &pcfg_pull_none>,
 					/* mac_rxdv */
-					<3 9 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB1 1 &pcfg_pull_none>,
 					/* mac_mdc */
-					<3 8 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB0 1 &pcfg_pull_none>,
 					/* mac_rxd1 */
-					<3 7 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA7 1 &pcfg_pull_none>,
 					/* mac_rxd0 */
-					<3 6 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA6 1 &pcfg_pull_none>,
 					/* mac_txd1 */
-					<3 5 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PA5 1 &pcfg_pull_none_13ma>,
 					/* mac_txd0 */
-					<3 4 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PA4 1 &pcfg_pull_none_13ma>,
 					/* mac_rxd3 */
-					<3 3 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA3 1 &pcfg_pull_none>,
 					/* mac_rxd2 */
-					<3 2 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA2 1 &pcfg_pull_none>,
 					/* mac_txd3 */
-					<3 1 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PA1 1 &pcfg_pull_none_13ma>,
 					/* mac_txd2 */
-					<3 0 RK_FUNC_1 &pcfg_pull_none_13ma>;
+					<3 RK_PA0 1 &pcfg_pull_none_13ma>;
 			};
 
 			rmii_pins: rmii-pins {
 				rockchip,pins =
 					/* mac_mdio */
-					<3 13 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB5 1 &pcfg_pull_none>,
 					/* mac_txen */
-					<3 12 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PB4 1 &pcfg_pull_none_13ma>,
 					/* mac_clk */
-					<3 11 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB3 1 &pcfg_pull_none>,
 					/* mac_rxer */
-					<3 10 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB2 1 &pcfg_pull_none>,
 					/* mac_rxdv */
-					<3 9 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB1 1 &pcfg_pull_none>,
 					/* mac_mdc */
-					<3 8 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PB0 1 &pcfg_pull_none>,
 					/* mac_rxd1 */
-					<3 7 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA7 1 &pcfg_pull_none>,
 					/* mac_rxd0 */
-					<3 6 RK_FUNC_1 &pcfg_pull_none>,
+					<3 RK_PA6 1 &pcfg_pull_none>,
 					/* mac_txd1 */
-					<3 5 RK_FUNC_1 &pcfg_pull_none_13ma>,
+					<3 RK_PA5 1 &pcfg_pull_none_13ma>,
 					/* mac_txd0 */
-					<3 4 RK_FUNC_1 &pcfg_pull_none_13ma>;
+					<3 RK_PA4 1 &pcfg_pull_none_13ma>;
 			};
 		};
 
 		i2c0 {
 			i2c0_xfer: i2c0-xfer {
 				rockchip,pins =
-					<1 15 RK_FUNC_2 &pcfg_pull_none>,
-					<1 16 RK_FUNC_2 &pcfg_pull_none>;
+					<1 RK_PB7 2 &pcfg_pull_none>,
+					<1 RK_PC0 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c1 {
 			i2c1_xfer: i2c1-xfer {
 				rockchip,pins =
-					<4 2 RK_FUNC_1 &pcfg_pull_none>,
-					<4 1 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PA2 1 &pcfg_pull_none>,
+					<4 RK_PA1 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c2 {
 			i2c2_xfer: i2c2-xfer {
 				rockchip,pins =
-					<2 1 RK_FUNC_2 &pcfg_pull_none_12ma>,
-					<2 0 RK_FUNC_2 &pcfg_pull_none_12ma>;
+					<2 RK_PA1 2 &pcfg_pull_none_12ma>,
+					<2 RK_PA0 2 &pcfg_pull_none_12ma>;
 			};
 		};
 
 		i2c3 {
 			i2c3_xfer: i2c3-xfer {
 				rockchip,pins =
-					<4 17 RK_FUNC_1 &pcfg_pull_none>,
-					<4 16 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PC1 1 &pcfg_pull_none>,
+					<4 RK_PC0 1 &pcfg_pull_none>;
 			};
 
 			i2c3_gpio: i2c3_gpio {
 				rockchip,pins =
-					<4 17 RK_FUNC_GPIO &pcfg_pull_none>,
-					<4 16 RK_FUNC_GPIO &pcfg_pull_none>;
+					<4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,
+					<4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 
 		};
@@ -2590,498 +2590,498 @@
 		i2c4 {
 			i2c4_xfer: i2c4-xfer {
 				rockchip,pins =
-					<1 12 RK_FUNC_1 &pcfg_pull_none>,
-					<1 11 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB4 1 &pcfg_pull_none>,
+					<1 RK_PB3 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2c5 {
 			i2c5_xfer: i2c5-xfer {
 				rockchip,pins =
-					<3 11 RK_FUNC_2 &pcfg_pull_none>,
-					<3 10 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PB3 2 &pcfg_pull_none>,
+					<3 RK_PB2 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c6 {
 			i2c6_xfer: i2c6-xfer {
 				rockchip,pins =
-					<2 10 RK_FUNC_2 &pcfg_pull_none>,
-					<2 9 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PB2 2 &pcfg_pull_none>,
+					<2 RK_PB1 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c7 {
 			i2c7_xfer: i2c7-xfer {
 				rockchip,pins =
-					<2 8 RK_FUNC_2 &pcfg_pull_none>,
-					<2 7 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PB0 2 &pcfg_pull_none>,
+					<2 RK_PA7 2 &pcfg_pull_none>;
 			};
 		};
 
 		i2c8 {
 			i2c8_xfer: i2c8-xfer {
 				rockchip,pins =
-					<1 21 RK_FUNC_1 &pcfg_pull_none>,
-					<1 20 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PC5 1 &pcfg_pull_none>,
+					<1 RK_PC4 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2s0 {
 			i2s0_2ch_bus: i2s0-2ch-bus {
 				rockchip,pins =
-					<3 24 RK_FUNC_1 &pcfg_pull_none>,
-					<3 25 RK_FUNC_1 &pcfg_pull_none>,
-					<3 26 RK_FUNC_1 &pcfg_pull_none>,
-					<3 27 RK_FUNC_1 &pcfg_pull_none>,
-					<3 31 RK_FUNC_1 &pcfg_pull_none>,
-					<4 0 RK_FUNC_1 &pcfg_pull_none>;
+					<3 RK_PD0 1 &pcfg_pull_none>,
+					<3 RK_PD1 1 &pcfg_pull_none>,
+					<3 RK_PD2 1 &pcfg_pull_none>,
+					<3 RK_PD3 1 &pcfg_pull_none>,
+					<3 RK_PD7 1 &pcfg_pull_none>,
+					<4 RK_PA0 1 &pcfg_pull_none>;
 			};
 
 			i2s0_8ch_bus: i2s0-8ch-bus {
 				rockchip,pins =
-					<3 24 RK_FUNC_1 &pcfg_pull_none>,
-					<3 25 RK_FUNC_1 &pcfg_pull_none>,
-					<3 26 RK_FUNC_1 &pcfg_pull_none>,
-					<3 27 RK_FUNC_1 &pcfg_pull_none>,
-					<3 28 RK_FUNC_1 &pcfg_pull_none>,
-					<3 29 RK_FUNC_1 &pcfg_pull_none>,
-					<3 30 RK_FUNC_1 &pcfg_pull_none>,
-					<3 31 RK_FUNC_1 &pcfg_pull_none>;
+					<3 RK_PD0 1 &pcfg_pull_none>,
+					<3 RK_PD1 1 &pcfg_pull_none>,
+					<3 RK_PD2 1 &pcfg_pull_none>,
+					<3 RK_PD3 1 &pcfg_pull_none>,
+					<3 RK_PD4 1 &pcfg_pull_none>,
+					<3 RK_PD5 1 &pcfg_pull_none>,
+					<3 RK_PD6 1 &pcfg_pull_none>,
+					<3 RK_PD7 1 &pcfg_pull_none>;
 			};
 
 			i2s_8ch_mclk: i2s-8ch-mclk {
-				rockchip,pins = <4 0 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
 			};
 		};
 
 		i2s1 {
 			i2s1_2ch_bus: i2s1-2ch-bus {
 				rockchip,pins =
-					<4 3 RK_FUNC_1 &pcfg_pull_none>,
-					<4 4 RK_FUNC_1 &pcfg_pull_none>,
-					<4 5 RK_FUNC_1 &pcfg_pull_none>,
-					<4 6 RK_FUNC_1 &pcfg_pull_none>,
-					<4 7 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PA3 1 &pcfg_pull_none>,
+					<4 RK_PA4 1 &pcfg_pull_none>,
+					<4 RK_PA5 1 &pcfg_pull_none>,
+					<4 RK_PA6 1 &pcfg_pull_none>,
+					<4 RK_PA7 1 &pcfg_pull_none>;
 			};
 		};
 
 		sdio0 {
 			sdio0_bus1: sdio0-bus1 {
 				rockchip,pins =
-					<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PC4 1 &pcfg_pull_up>;
 			};
 
 			sdio0_bus4: sdio0-bus4 {
 				rockchip,pins =
-					<2 RK_PC4 RK_FUNC_1 &pcfg_pull_up>,
-					<2 RK_PC5 RK_FUNC_1 &pcfg_pull_up>,
-					<2 RK_PC6 RK_FUNC_1 &pcfg_pull_up>,
-					<2 RK_PC7 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PC4 1 &pcfg_pull_up>,
+					<2 RK_PC5 1 &pcfg_pull_up>,
+					<2 RK_PC6 1 &pcfg_pull_up>,
+					<2 RK_PC7 1 &pcfg_pull_up>;
 			};
 
 			sdio0_cmd: sdio0-cmd {
 				rockchip,pins =
-					<2 RK_PD0 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PD0 1 &pcfg_pull_up>;
 			};
 
 			sdio0_clk: sdio0-clk {
 				rockchip,pins =
-					<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PD1 1 &pcfg_pull_none>;
 			};
 
 			sdio0_cd: sdio0-cd {
 				rockchip,pins =
-					<2 RK_PD2 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PD2 1 &pcfg_pull_up>;
 			};
 
 			sdio0_pwr: sdio0-pwr {
 				rockchip,pins =
-					<2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PD3 1 &pcfg_pull_up>;
 			};
 
 			sdio0_bkpwr: sdio0-bkpwr {
 				rockchip,pins =
-					<2 RK_PD4 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PD4 1 &pcfg_pull_up>;
 			};
 
 			sdio0_wp: sdio0-wp {
 				rockchip,pins =
-					<0 RK_PA3 RK_FUNC_1 &pcfg_pull_up>;
+					<0 RK_PA3 1 &pcfg_pull_up>;
 			};
 
 			sdio0_int: sdio0-int {
 				rockchip,pins =
-					<0 RK_PA4 RK_FUNC_1 &pcfg_pull_up>;
+					<0 RK_PA4 1 &pcfg_pull_up>;
 			};
 		};
 
 		sdmmc {
 			sdmmc_bus1: sdmmc-bus1 {
 				rockchip,pins =
-					<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up>;
+					<4 RK_PB0 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_bus4: sdmmc-bus4 {
 				rockchip,pins =
-					<4 RK_PB0 RK_FUNC_1 &pcfg_pull_up>,
-					<4 RK_PB1 RK_FUNC_1 &pcfg_pull_up>,
-					<4 RK_PB2 RK_FUNC_1 &pcfg_pull_up>,
-					<4 RK_PB3 RK_FUNC_1 &pcfg_pull_up>;
+					<4 RK_PB0 1 &pcfg_pull_up>,
+					<4 RK_PB1 1 &pcfg_pull_up>,
+					<4 RK_PB2 1 &pcfg_pull_up>,
+					<4 RK_PB3 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_clk: sdmmc-clk {
 				rockchip,pins =
-					<4 RK_PB4 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PB4 1 &pcfg_pull_none>;
 			};
 
 			sdmmc_cmd: sdmmc-cmd {
 				rockchip,pins =
-					<4 RK_PB5 RK_FUNC_1 &pcfg_pull_up>;
+					<4 RK_PB5 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_cd: sdmmc-cd {
 				rockchip,pins =
-					<0 RK_PA7 RK_FUNC_1 &pcfg_pull_up>;
+					<0 RK_PA7 1 &pcfg_pull_up>;
 			};
 
 			sdmmc_wp: sdmmc-wp {
 				rockchip,pins =
-					<0 RK_PB0 RK_FUNC_1 &pcfg_pull_up>;
+					<0 RK_PB0 1 &pcfg_pull_up>;
 			};
 		};
 
 		sleep {
 			ap_pwroff: ap-pwroff {
-				rockchip,pins = <1 5 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>;
 			};
 
 			ddrio_pwroff: ddrio-pwroff {
-				rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <0 RK_PA1 1 &pcfg_pull_none>;
 			};
 		};
 
 		spdif {
 			spdif_bus: spdif-bus {
 				rockchip,pins =
-					<4 21 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PC5 1 &pcfg_pull_none>;
 			};
 
 			spdif_bus_1: spdif-bus-1 {
 				rockchip,pins =
-					<3 RK_PC0 RK_FUNC_3 &pcfg_pull_none>;
+					<3 RK_PC0 3 &pcfg_pull_none>;
 			};
 		};
 
 		spi0 {
 			spi0_clk: spi0-clk {
 				rockchip,pins =
-					<3 6 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA6 2 &pcfg_pull_up>;
 			};
 			spi0_cs0: spi0-cs0 {
 				rockchip,pins =
-					<3 7 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA7 2 &pcfg_pull_up>;
 			};
 			spi0_cs1: spi0-cs1 {
 				rockchip,pins =
-					<3 8 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PB0 2 &pcfg_pull_up>;
 			};
 			spi0_tx: spi0-tx {
 				rockchip,pins =
-					<3 5 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA5 2 &pcfg_pull_up>;
 			};
 			spi0_rx: spi0-rx {
 				rockchip,pins =
-					<3 4 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA4 2 &pcfg_pull_up>;
 			};
 		};
 
 		spi1 {
 			spi1_clk: spi1-clk {
 				rockchip,pins =
-					<1 9 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PB1 2 &pcfg_pull_up>;
 			};
 			spi1_cs0: spi1-cs0 {
 				rockchip,pins =
-					<1 10 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PB2 2 &pcfg_pull_up>;
 			};
 			spi1_rx: spi1-rx {
 				rockchip,pins =
-					<1 7 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PA7 2 &pcfg_pull_up>;
 			};
 			spi1_tx: spi1-tx {
 				rockchip,pins =
-					<1 8 RK_FUNC_2 &pcfg_pull_up>;
+					<1 RK_PB0 2 &pcfg_pull_up>;
 			};
 		};
 
 		spi2 {
 			spi2_clk: spi2-clk {
 				rockchip,pins =
-					<2 11 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PB3 1 &pcfg_pull_up>;
 			};
 			spi2_cs0: spi2-cs0 {
 				rockchip,pins =
-					<2 12 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PB4 1 &pcfg_pull_up>;
 			};
 			spi2_rx: spi2-rx {
 				rockchip,pins =
-					<2 9 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PB1 1 &pcfg_pull_up>;
 			};
 			spi2_tx: spi2-tx {
 				rockchip,pins =
-					<2 10 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PB2 1 &pcfg_pull_up>;
 			};
 		};
 
 		spi3 {
 			spi3_clk: spi3-clk {
 				rockchip,pins =
-					<1 17 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC1 1 &pcfg_pull_up>;
 			};
 			spi3_cs0: spi3-cs0 {
 				rockchip,pins =
-					<1 18 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC2 1 &pcfg_pull_up>;
 			};
 			spi3_rx: spi3-rx {
 				rockchip,pins =
-					<1 15 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PB7 1 &pcfg_pull_up>;
 			};
 			spi3_tx: spi3-tx {
 				rockchip,pins =
-					<1 16 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PC0 1 &pcfg_pull_up>;
 			};
 		};
 
 		spi4 {
 			spi4_clk: spi4-clk {
 				rockchip,pins =
-					<3 2 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA2 2 &pcfg_pull_up>;
 			};
 			spi4_cs0: spi4-cs0 {
 				rockchip,pins =
-					<3 3 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA3 2 &pcfg_pull_up>;
 			};
 			spi4_rx: spi4-rx {
 				rockchip,pins =
-					<3 0 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA0 2 &pcfg_pull_up>;
 			};
 			spi4_tx: spi4-tx {
 				rockchip,pins =
-					<3 1 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PA1 2 &pcfg_pull_up>;
 			};
 		};
 
 		spi5 {
 			spi5_clk: spi5-clk {
 				rockchip,pins =
-					<2 22 RK_FUNC_2 &pcfg_pull_up>;
+					<2 RK_PC6 2 &pcfg_pull_up>;
 			};
 			spi5_cs0: spi5-cs0 {
 				rockchip,pins =
-					<2 23 RK_FUNC_2 &pcfg_pull_up>;
+					<2 RK_PC7 2 &pcfg_pull_up>;
 			};
 			spi5_rx: spi5-rx {
 				rockchip,pins =
-					<2 20 RK_FUNC_2 &pcfg_pull_up>;
+					<2 RK_PC4 2 &pcfg_pull_up>;
 			};
 			spi5_tx: spi5-tx {
 				rockchip,pins =
-					<2 21 RK_FUNC_2 &pcfg_pull_up>;
+					<2 RK_PC5 2 &pcfg_pull_up>;
 			};
 		};
 
 		testclk {
 			test_clkout0: test-clkout0 {
 				rockchip,pins =
-					<0 0 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PA0 1 &pcfg_pull_none>;
 			};
 
 			test_clkout1: test-clkout1 {
 				rockchip,pins =
-					<2 25 RK_FUNC_2 &pcfg_pull_none>;
+					<2 RK_PD1 2 &pcfg_pull_none>;
 			};
 
 			test_clkout2: test-clkout2 {
 				rockchip,pins =
-					<0 8 RK_FUNC_3 &pcfg_pull_none>;
+					<0 RK_PB0 3 &pcfg_pull_none>;
 			};
 		};
 
 		tsadc {
 			otp_gpio: otp-gpio {
-				rockchip,pins = <1 6 RK_FUNC_GPIO &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 
 			otp_out: otp-out {
-				rockchip,pins = <1 6 RK_FUNC_1 &pcfg_pull_none>;
+				rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none>;
 			};
 		};
 
 		uart0 {
 			uart0_xfer: uart0-xfer {
 				rockchip,pins =
-					<2 16 RK_FUNC_1 &pcfg_pull_up>,
-					<2 17 RK_FUNC_1 &pcfg_pull_up>;
+					<2 RK_PC0 1 &pcfg_pull_up>,
+					<2 RK_PC1 1 &pcfg_pull_up>;
 			};
 
 			uart0_cts: uart0-cts {
 				rockchip,pins =
-					<2 18 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC2 1 &pcfg_pull_none>;
 			};
 
 			uart0_rts: uart0-rts {
 				rockchip,pins =
-					<2 19 RK_FUNC_1 &pcfg_pull_none>;
+					<2 RK_PC3 1 &pcfg_pull_none>;
 			};
 		};
 
 		uart1 {
 			uart1_xfer: uart1-xfer {
 				rockchip,pins =
-					<3 12 RK_FUNC_2 &pcfg_pull_up>,
-					<3 13 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PB4 2 &pcfg_pull_up>,
+					<3 RK_PB5 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart2a {
 			uart2a_xfer: uart2a-xfer {
 				rockchip,pins =
-					<4 8 RK_FUNC_2 &pcfg_pull_up>,
-					<4 9 RK_FUNC_2 &pcfg_pull_up>;
+					<4 RK_PB0 2 &pcfg_pull_up>,
+					<4 RK_PB1 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart2b {
 			uart2b_xfer: uart2b-xfer {
 				rockchip,pins =
-					<4 16 RK_FUNC_2 &pcfg_pull_up>,
-					<4 17 RK_FUNC_2 &pcfg_pull_up>;
+					<4 RK_PC0 2 &pcfg_pull_up>,
+					<4 RK_PC1 2 &pcfg_pull_up>;
 			};
 		};
 
 		uart2c {
 			uart2c_xfer: uart2c-xfer {
 				rockchip,pins =
-					<4 19 RK_FUNC_1 &pcfg_pull_up>,
-					<4 20 RK_FUNC_1 &pcfg_pull_up>;
+					<4 RK_PC3 1 &pcfg_pull_up>,
+					<4 RK_PC4 1 &pcfg_pull_up>;
 			};
 		};
 
 		uart3 {
 			uart3_xfer: uart3-xfer {
 				rockchip,pins =
-					<3 14 RK_FUNC_2 &pcfg_pull_up>,
-					<3 15 RK_FUNC_2 &pcfg_pull_up>;
+					<3 RK_PB6 2 &pcfg_pull_up>,
+					<3 RK_PB7 2 &pcfg_pull_up>;
 			};
 
 			uart3_cts: uart3-cts {
 				rockchip,pins =
-					<3 16 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC0 2 &pcfg_pull_none>;
 			};
 
 			uart3_rts: uart3-rts {
 				rockchip,pins =
-					<3 17 RK_FUNC_2 &pcfg_pull_none>;
+					<3 RK_PC1 2 &pcfg_pull_none>;
 			};
 		};
 
 		uart4 {
 			uart4_xfer: uart4-xfer {
 				rockchip,pins =
-					<1 7 RK_FUNC_1 &pcfg_pull_up>,
-					<1 8 RK_FUNC_1 &pcfg_pull_up>;
+					<1 RK_PA7 1 &pcfg_pull_up>,
+					<1 RK_PB0 1 &pcfg_pull_up>;
 			};
 		};
 
 		uarthdcp {
 			uarthdcp_xfer: uarthdcp-xfer {
 				rockchip,pins =
-					<4 21 RK_FUNC_2 &pcfg_pull_up>,
-					<4 22 RK_FUNC_2 &pcfg_pull_up>;
+					<4 RK_PC5 2 &pcfg_pull_up>,
+					<4 RK_PC6 2 &pcfg_pull_up>;
 			};
 		};
 
 		pwm0 {
 			pwm0_pin: pwm0-pin {
 				rockchip,pins =
-					<4 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PC2 1 &pcfg_pull_none>;
 			};
 
 			pwm0_pin_pull_down: pwm0-pin-pull-down {
 				rockchip,pins =
-					<4 RK_PC2 RK_FUNC_1 &pcfg_pull_down>;
+					<4 RK_PC2 1 &pcfg_pull_down>;
 			};
 
 			vop0_pwm_pin: vop0-pwm-pin {
 				rockchip,pins =
-					<4 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
+					<4 RK_PC2 2 &pcfg_pull_none>;
 			};
 
 			vop1_pwm_pin: vop1-pwm-pin {
 				rockchip,pins =
-					<4 RK_PC2 RK_FUNC_3 &pcfg_pull_none>;
+					<4 RK_PC2 3 &pcfg_pull_none>;
 			};
 		};
 
 		pwm1 {
 			pwm1_pin: pwm1-pin {
 				rockchip,pins =
-					<4 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PC6 1 &pcfg_pull_none>;
 			};
 
 			pwm1_pin_pull_down: pwm1-pin-pull-down {
 				rockchip,pins =
-					<4 RK_PC6 RK_FUNC_1 &pcfg_pull_down>;
+					<4 RK_PC6 1 &pcfg_pull_down>;
 			};
 		};
 
 		pwm2 {
 			pwm2_pin: pwm2-pin {
 				rockchip,pins =
-					<1 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PC3 1 &pcfg_pull_none>;
 			};
 
 			pwm2_pin_pull_down: pwm2-pin-pull-down {
 				rockchip,pins =
-					<1 RK_PC3 RK_FUNC_1 &pcfg_pull_down>;
+					<1 RK_PC3 1 &pcfg_pull_down>;
 			};
 		};
 
 		pwm3a {
 			pwm3a_pin: pwm3a-pin {
 				rockchip,pins =
-					<0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+					<0 RK_PA6 1 &pcfg_pull_none>;
 			};
 
 			pwm3a_pin_pull_down: pwm3a-pin-pull-down {
 				rockchip,pins =
-					<0 RK_PA6 RK_FUNC_1 &pcfg_pull_down>;
+					<0 RK_PA6 1 &pcfg_pull_down>;
 			};
 		};
 
 		pwm3b {
 			pwm3b_pin: pwm3b-pin {
 				rockchip,pins =
-					<1 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;
+					<1 RK_PB6 1 &pcfg_pull_none>;
 			};
 
 			pwm3b_pin_pull_down: pwm3b-pin-pull-down {
 				rockchip,pins =
-					<1 RK_PB6 RK_FUNC_1 &pcfg_pull_down>;
+					<1 RK_PB6 1 &pcfg_pull_down>;
 			};
 		};
 
 		hdmi {
 			hdmi_i2c_xfer: hdmi-i2c-xfer {
 				rockchip,pins =
-					<4 RK_PC1 RK_FUNC_3 &pcfg_pull_none>,
-					<4 RK_PC0 RK_FUNC_3 &pcfg_pull_none>;
+					<4 RK_PC1 3 &pcfg_pull_none>,
+					<4 RK_PC0 3 &pcfg_pull_none>;
 			};
 
 			hdmi_cec: hdmi-cec {
 				rockchip,pins =
-					<4 RK_PC7 RK_FUNC_1 &pcfg_pull_none>;
+					<4 RK_PC7 1 &pcfg_pull_none>;
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts
index db77fb3c4072..f975f47b76d6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts
@@ -1174,28 +1174,28 @@
 	bq2570 {
 		charger_ok_int: charger-ok-int {
 			rockchip,pins =
-				<1 RK_PA1 0 &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 RK_PA2 0 &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 RK_PB5 0 &pcfg_pull_up>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd_rst {
 		lcd_rst_gpio: lcd-rst-gpio {
 			rockchip,pins =
-				<3 RK_PA4 0 &pcfg_pull_none>;
+				<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -1209,20 +1209,20 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 RK_PC2 0 &pcfg_pull_up>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 RK_PC1 0 &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 RK_PB6 0 &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -1239,51 +1239,51 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<2 RK_PD3 0 &pcfg_pull_none>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_10ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_10ma>;
 		};
 	};
 
 	tp_irq {
 		tp_irq_gpio: tp-irq-gpio {
 			rockchip,pins =
-				<3 RK_PB0 0 &pcfg_pull_up>;
+				<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wireless-bluetooth {
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 RK_PC3 0 &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
index 1b4301261c3c..08ac2a477852 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
@@ -1084,28 +1084,28 @@
 	bq2570 {
 		charger_ok_int: charger-ok-int {
 			rockchip,pins =
-				<1 RK_PA1 0 &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 RK_PA2 0 &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 RK_PB5 0 &pcfg_pull_up>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd_rst {
 		lcd_rst_gpio: lcd-rst-gpio {
 			rockchip,pins =
-				<3 RK_PA4 0 &pcfg_pull_none>;
+				<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -1119,20 +1119,20 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 RK_PC2 0 &pcfg_pull_up>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 RK_PC1 0 &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 RK_PB6 0 &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -1149,51 +1149,51 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<2 RK_PD3 0 &pcfg_pull_none>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_10ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_10ma>;
 		};
 	};
 
 	tp_irq {
 		tp_irq_gpio: tp-irq-gpio {
 			rockchip,pins =
-				<3 RK_PB0 0 &pcfg_pull_up>;
+				<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wireless-bluetooth {
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 RK_PC3 0 &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts
index 6585e48c0b76..398f962114cf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts
@@ -952,28 +952,28 @@
 	bq2570 {
 		charger_ok_int: charger-ok-int {
 			rockchip,pins =
-				<1 RK_PA1 0 &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 RK_PA2 0 &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 RK_PB5 0 &pcfg_pull_up>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd_rst {
 		lcd_rst_gpio: lcd-rst-gpio {
 			rockchip,pins =
-				<3 RK_PA4 0 &pcfg_pull_none>;
+				<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -987,20 +987,20 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 RK_PC2 0 &pcfg_pull_up>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 RK_PC1 0 &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 RK_PB6 0 &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -1012,50 +1012,50 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<2 RK_PD3 0 &pcfg_pull_none>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_10ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_10ma>;
 		};
 	};
 
 	tp_irq {
 		tp_irq_gpio: tp-irq-gpio {
 			rockchip,pins =
-				<3 RK_PB0 0 &pcfg_pull_up>;
+				<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 RK_PC3 0 &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
index 615f0c998c16..c3faaa1ba4d3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
@@ -1097,35 +1097,35 @@
 	bq2570 {
 		charger_ok_int: charger-ok-int {
 			rockchip,pins =
-				<1 RK_PA1 0 &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	camera {
 		cam_pwren_high: cam-pwren-high {
 			rockchip,pins =
-				<4 RK_PC5 0 &pcfg_output_high>;
+				<4 RK_PC5 RK_FUNC_GPIO &pcfg_output_high>;
 			};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 RK_PA2 0 &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 RK_PB5 0 &pcfg_pull_up>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd_rst {
 		lcd_rst_gpio: lcd-rst-gpio {
 			rockchip,pins =
-				<3 RK_PA4 0 &pcfg_pull_none>;
+				<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -1139,20 +1139,20 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 RK_PC2 0 &pcfg_pull_up>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 RK_PC1 0 &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 RK_PB6 0 &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -1169,51 +1169,51 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<2 RK_PD3 0 &pcfg_pull_none>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_10ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_10ma>;
 		};
 	};
 
 	tp_irq {
 		tp_irq_gpio: tp-irq-gpio {
 			rockchip,pins =
-				<3 RK_PB0 0 &pcfg_pull_up>;
+				<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wireless-bluetooth {
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 RK_PC3 0 &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts
index c3e9cc29fc62..7d118a783353 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts
@@ -935,28 +935,28 @@
 	bq2570 {
 		charger_ok_int: charger-ok-int {
 			rockchip,pins =
-				<1 RK_PA1 0 &pcfg_pull_up>;
+				<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	fusb30x {
 		fusb0_int: fusb0-int {
 			rockchip,pins =
-				<1 RK_PA2 0 &pcfg_pull_up>;
+				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
 			};
 	};
 
 	headphone {
 		hp_det: hp-det {
 			rockchip,pins =
-				<0 RK_PB5 0 &pcfg_pull_up>;
+				<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	lcd_rst {
 		lcd_rst_gpio: lcd-rst-gpio {
 			rockchip,pins =
-				<3 RK_PA4 0 &pcfg_pull_none>;
+				<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -970,20 +970,20 @@
 	pmic {
 		pmic_int_l: pmic-int-l {
 			rockchip,pins =
-				<1 RK_PC2 0 &pcfg_pull_up>;
+				<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 		vsel1_gpio: vsel1-gpio {
 			rockchip,pins =
-				<1 RK_PC1 0 &pcfg_pull_down>;
+				<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 		vsel2_gpio: vsel2-gpio {
 			rockchip,pins =
-				<1 RK_PB6 0 &pcfg_pull_down>;
+				<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
 		soc_slppin_gpio: soc-slppin-gpio {
 			rockchip,pins =
-				<1 RK_PA5 0 &pcfg_output_low>;
+				<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
 		};
 
 		soc_slppin_slp: soc-slppin-slp {
@@ -995,51 +995,51 @@
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
 			rockchip,pins =
-				<2 RK_PD3 0 &pcfg_pull_none>;
+				<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sdmmc {
 		sdmmc_bus1: sdmmc-bus1 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_bus4: sdmmc-bus4 {
 			rockchip,pins =
-				<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
-				<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB0 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB1 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB2 1 &pcfg_pull_up_10ma>,
+				<4 RK_PB3 1 &pcfg_pull_up_10ma>;
 		};
 
 		sdmmc_clk: sdmmc-clk {
 			rockchip,pins =
-				<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
+				<4 RK_PB4 1 &pcfg_pull_none_10ma>;
 		};
 
 		sdmmc_cmd: sdmmc-cmd {
 			rockchip,pins =
-				<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
+				<4 RK_PB5 1 &pcfg_pull_up_10ma>;
 		};
 	};
 
 	tp_irq {
 		tp_irq_gpio: tp-irq-gpio {
 			rockchip,pins =
-				<3 RK_PB0 0 &pcfg_pull_up>;
+				<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
 	wireless-bluetooth {
 		uart0_gpios: uart0-gpios {
 			rockchip,pins =
-				<2 RK_PC3 0 &pcfg_pull_none>;
+				<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		bt_irq_gpio: bt-irq-gpio {
 			rockchip,pins =
-				<0 RK_PA5 0 &pcfg_pull_down>;
+				<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts
index cf79dad33e74..96a3fb56cfe5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts
@@ -130,11 +130,11 @@
 &pinctrl {
 	vsel_gpio: vsel-gpio {
 		rockchip,pins =
-			<0 RK_PC6 0 &pcfg_pull_down>;
+			<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
 	};
 
 	pwr_key: pwr-key {
 		rockchip,pins =
-			<0 RK_PB0 0 &pcfg_pull_none>;
+			<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 	};
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi
index e99ea0960156..3f176b3bc94f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi
@@ -802,7 +802,7 @@
 		tsadc {
 			tsadc_otp_gpio: tsadc-otp-gpio {
 				rockchip,pins =
-					<0 RK_PA6 0 &pcfg_pull_none>;
+					<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
 			};
 
 			tsadc_otp_out: tsadc-otp-out {
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts
index ead8117c3679..90342f0a455c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts
@@ -911,12 +911,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts
index 5ca568f433c9..b781b244c0ce 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts
@@ -713,7 +713,7 @@
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
-				<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		camera_rst: camera-rst {
@@ -762,12 +762,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
index 38cc9a638e99..283009a7233c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
@@ -786,12 +786,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts
index 15647bc451d3..55f0027b0215 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts
@@ -1006,7 +1006,7 @@
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
-				<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		cam_sleep: cam-sleep {
@@ -1070,12 +1070,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
index 8e80fb23090c..0289e448b6ef 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
@@ -912,7 +912,7 @@
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
-				<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		cam_sleep: cam-sleep {
@@ -980,12 +980,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
index 50602cc452d3..7d096794a1fb 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
@@ -934,7 +934,7 @@
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
-				<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		cam_sleep: cam-sleep {
@@ -998,12 +998,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
index e29580f2fcae..23a5687631e5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
@@ -933,7 +933,7 @@
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
-				<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
+				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
 		cam_sleep: cam-sleep {
@@ -994,12 +994,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
index b658ca72c69e..933f39384587 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
@@ -1433,7 +1433,7 @@
 
 	mxc6655xa {
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
-			rockchip,pins = <RK_GPIO3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -1450,12 +1450,12 @@
 
 		soc_slppin_slp: soc_slppin_slp {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
+				<0 RK_PA2 1 &pcfg_pull_none>;
 		};
 
 		soc_slppin_rst: soc_slppin_rst {
 			rockchip,pins =
-				<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
+				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi
index 76ff3c2bdcfa..7758ce3ed47b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi
@@ -268,13 +268,13 @@
 
 	mxc6655xa {
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
-			rockchip,pins = <RK_GPIO3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	sii902x {
 		sii902x_hdmi_int: sii902x-hdmi-int {
-			rockchip,pins = <3 RK_PA0 0 &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi
index cab075b007dd..1a7ebb1ed1e9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi
@@ -431,7 +431,7 @@
 
 	sii902x {
 		sii902x_hdmi_int: sii902x-hdmi-int {
-			rockchip,pins = <4 RK_PD2 0 &pcfg_pull_up>;
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
index fb0b071609b7..d9ebb2ba919f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
@@ -2783,7 +2783,7 @@
 		/omit-if-no-ref/
 		tsadc_gpio: tsadc-gpio {
 			rockchip,pins =
-				<0 RK_PA1 0 &pcfg_pull_none>;
+				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };