diff --git a/.gitignore b/.gitignore
index 54f9958c8f80..e690ad1f5b48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,4 +137,5 @@ defconfig
 
 # Kdevelop4
 *.kdev4
-
+*.dtb*
+*.scr
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 7bb0c665a6e9..a61d58c77cdc 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -113,3 +113,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nvr-demo-v12-linux-spi-nand.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat2.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat2-io.dtb
+
+subdir-y	:= $(dts-dirs) overlay
diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
new file mode 100644
index 000000000000..eff1e7de0b8c
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0
+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
+	lubancat2-uart3-overlay.dtbo
+
+scr-$(CONFIG_ARCH_ROCKCHIP) += \
+	rockchip-fixup.scr
+
+dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \
+	README.rockchip-overlays
+
+targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
+
+always			:= $(dtbo-y) $(scr-y) $(dtbotxt-y)
+clean-files		:= *.dtbo *.scr
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
new file mode 100644
index 000000000000..b2ad6211d71f
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays
@@ -0,0 +1,13 @@
+## Introduction
+
+## Platform and Chips:
+
+rockchip (Rockchip)
+- rk3566
+- rk3568
+
+## usage
+
+Kernel provided DT overlay files are in
+  /boot/dtbs/$(uname -r)/rockchip/overlay/
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/lubancat2-uart3-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/lubancat2-uart3-overlay.dts
new file mode 100644
index 000000000000..09009ceb0c8e
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/lubancat2-uart3-overlay.dts
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 - All Rights Reserved by
+ * filename : lubancat2-uart-overlay.dts
+ * brief : Device Tree overlay for ebf lubancat2 uart device
+ * author : embedfire
+ * date : 2022-05-31
+ * version : A001
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3568-cru.h>
+
+
+/ {
+	fragment@0 {
+		target = <&uart3>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
+
diff --git a/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
new file mode 100644
index 000000000000..18742b8b68c0
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-fixup.scr-cmd
@@ -0,0 +1,30 @@
+# overlays fixup script
+# implements (or rather substitutes) overlay arguments functionality
+# using u-boot scripting, environment variables and "fdt" command
+
+setenv decompose_pin 'setexpr tmp_pinctrl sub "GPIO(0|1|2|3|4)_\\S\\d+" "\\1";
+setexpr tmp_bank sub "GPIO\\d_(\\S)\\d+" "\\1";
+test "${tmp_bank}" = "A" && setenv tmp_bank 0;
+test "${tmp_bank}" = "B" && setenv tmp_bank 1;
+test "${tmp_bank}" = "C" && setenv tmp_bank 2;
+test "${tmp_bank}" = "D" && setenv tmp_bank 3;
+setexpr tmp_pin sub "GPIO\\d_\\S(\\d+)" "\\1";
+setexpr tmp_bank ${tmp_bank} * 8;
+setexpr tmp_pin ${tmp_bank} + ${tmp_pin}'
+
+if test -n "${param_w1_pin}"; then
+	setenv tmp_pinctrl "${param_w1_pin}"
+	setenv tmp_bank "${param_w1_pin}"
+	setenv tmp_pin "${param_w1_pin}"
+	run decompose_pin
+	echo "${param_w1_pin} ---> pinctrl = ${tmp_pinctrl}"
+	echo "${param_w1_pin} ---> bank = ${tmp_bank}"
+	echo "${param_w1_pin} ---> pin = ${tmp_pin}"
+	fdt get value tmp_pinctrl /__symbols__	gpio${tmp_pinctrl}
+	echo "${param_w1_pin} ---> tmp_pinctrl = ${tmp_pinctrl}"
+	fdt get value tmp_phandle ${tmp_pinctrl} phandle
+	echo "${param_w1_pin} ---> tmp_phandle = ${tmp_phandle}"
+	fdt set /onewire@0 gpios "<${tmp_phandle} ${tmp_pin} 0 0>"
+	env delete tmp_pinctrl tmp_bank tmp_pin tmp_phandle
+fi
+
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
index 347197d7f1a4..fe2356485622 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
@@ -12,7 +12,6 @@
  */
 &pinctrl {
 	acodec {
-		/omit-if-no-ref/
 		acodec_pins: acodec-pins {
 			rockchip,pins =
 				/* acodec_adc_sync */
@@ -33,42 +32,36 @@
 	};
 
 	audiopwm {
-		/omit-if-no-ref/
 		audiopwm_lout: audiopwm-lout {
 			rockchip,pins =
 				/* audiopwm_lout */
 				<1 RK_PA0 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		audiopwm_loutn: audiopwm-loutn {
 			rockchip,pins =
 				/* audiopwm_loutn */
 				<1 RK_PA1 6 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		audiopwm_loutp: audiopwm-loutp {
 			rockchip,pins =
 				/* audiopwm_loutp */
 				<1 RK_PA0 6 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		audiopwm_rout: audiopwm-rout {
 			rockchip,pins =
 				/* audiopwm_rout */
 				<1 RK_PA1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		audiopwm_routn: audiopwm-routn {
 			rockchip,pins =
 				/* audiopwm_routn */
 				<1 RK_PA7 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		audiopwm_routp: audiopwm-routp {
 			rockchip,pins =
 				/* audiopwm_routp */
@@ -77,7 +70,6 @@
 	};
 
 	bt656 {
-		/omit-if-no-ref/
 		bt656m0_pins: bt656m0-pins {
 			rockchip,pins =
 				/* bt656_clkm0 */
@@ -100,7 +92,6 @@
 				<2 RK_PD7 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		bt656m1_pins: bt656m1-pins {
 			rockchip,pins =
 				/* bt656_clkm1 */
@@ -125,7 +116,6 @@
 	};
 
 	bt1120 {
-		/omit-if-no-ref/
 		bt1120_pins: bt1120-pins {
 			rockchip,pins =
 				/* bt1120_clk */
@@ -166,14 +156,12 @@
 	};
 
 	cam {
-		/omit-if-no-ref/
 		cam_clkout0: cam-clkout0 {
 			rockchip,pins =
 				/* cam_clkout0 */
 				<4 RK_PA7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		cam_clkout1: cam-clkout1 {
 			rockchip,pins =
 				/* cam_clkout1 */
@@ -182,7 +170,6 @@
 	};
 
 	can0 {
-		/omit-if-no-ref/
 		can0m0_pins: can0m0-pins {
 			rockchip,pins =
 				/* can0_rxm0 */
@@ -191,7 +178,6 @@
 				<0 RK_PB3 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		can0m1_pins: can0m1-pins {
 			rockchip,pins =
 				/* can0_rxm1 */
@@ -202,7 +188,6 @@
 	};
 
 	can1 {
-		/omit-if-no-ref/
 		can1m0_pins: can1m0-pins {
 			rockchip,pins =
 				/* can1_rxm0 */
@@ -211,7 +196,6 @@
 				<1 RK_PA1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		can1m1_pins: can1m1-pins {
 			rockchip,pins =
 				/* can1_rxm1 */
@@ -222,7 +206,6 @@
 	};
 
 	can2 {
-		/omit-if-no-ref/
 		can2m0_pins: can2m0-pins {
 			rockchip,pins =
 				/* can2_rxm0 */
@@ -231,7 +214,6 @@
 				<4 RK_PB5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		can2m1_pins: can2m1-pins {
 			rockchip,pins =
 				/* can2_rxm1 */
@@ -242,14 +224,12 @@
 	};
 
 	cif {
-		/omit-if-no-ref/
 		cif_clk: cif-clk {
 			rockchip,pins =
 				/* cif_clkout */
 				<4 RK_PC0 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		cif_dvp_clk: cif-dvp-clk {
 			rockchip,pins =
 				/* cif_clkin */
@@ -260,7 +240,6 @@
 				<4 RK_PB7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		cif_dvp_bus16: cif-dvp-bus16 {
 			rockchip,pins =
 				/* cif_d8 */
@@ -281,7 +260,6 @@
 				<4 RK_PA5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		cif_dvp_bus8: cif-dvp-bus8 {
 			rockchip,pins =
 				/* cif_d0 */
@@ -304,21 +282,18 @@
 	};
 
 	clk32k {
-		/omit-if-no-ref/
 		clk32k_in: clk32k-in {
 			rockchip,pins =
 				/* clk32k_in */
 				<0 RK_PB0 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		clk32k_out0: clk32k-out0 {
 			rockchip,pins =
 				/* clk32k_out0 */
 				<0 RK_PB0 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		clk32k_out1: clk32k-out1 {
 			rockchip,pins =
 				/* clk32k_out1 */
@@ -327,7 +302,6 @@
 	};
 
 	cpu {
-		/omit-if-no-ref/
 		cpu_pins: cpu-pins {
 			rockchip,pins =
 				/* cpu_avs */
@@ -336,7 +310,6 @@
 	};
 
 	ebc {
-		/omit-if-no-ref/
 		ebc_extern: ebc-extern {
 			rockchip,pins =
 				/* ebc_sdce1 */
@@ -351,7 +324,6 @@
 				<4 RK_PB2 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		ebc_pins: ebc-pins {
 			rockchip,pins =
 				/* ebc_gdclk */
@@ -404,14 +376,12 @@
 	};
 
 	edpdp {
-		/omit-if-no-ref/
 		edpdpm0_pins: edpdpm0-pins {
 			rockchip,pins =
 				/* edpdp_hpdinm0 */
 				<4 RK_PC4 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		edpdpm1_pins: edpdpm1-pins {
 			rockchip,pins =
 				/* edpdp_hpdinm1 */
@@ -420,14 +390,12 @@
 	};
 
 	emmc {
-		/omit-if-no-ref/
 		emmc_rstnout: emmc-rstnout {
 			rockchip,pins =
 				/* emmc_rstn */
 				<1 RK_PC7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		emmc_bus8: emmc-bus8 {
 			rockchip,pins =
 				/* emmc_d0 */
@@ -448,21 +416,18 @@
 				<1 RK_PC3 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		emmc_clk: emmc-clk {
 			rockchip,pins =
 				/* emmc_clkout */
 				<1 RK_PC5 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		emmc_cmd: emmc-cmd {
 			rockchip,pins =
 				/* emmc_cmd */
 				<1 RK_PC4 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		emmc_datastrobe: emmc-datastrobe {
 			rockchip,pins =
 				/* emmc_datastrobe */
@@ -471,7 +436,6 @@
 	};
 
 	eth0 {
-		/omit-if-no-ref/
 		eth0_pins: eth0-pins {
 			rockchip,pins =
 				/* eth0_refclko25m */
@@ -480,14 +444,12 @@
 	};
 
 	eth1 {
-		/omit-if-no-ref/
 		eth1m0_pins: eth1m0-pins {
 			rockchip,pins =
 				/* eth1_refclko25mm0 */
 				<3 RK_PB0 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		eth1m1_pins: eth1m1-pins {
 			rockchip,pins =
 				/* eth1_refclko25mm1 */
@@ -496,7 +458,6 @@
 	};
 
 	flash {
-		/omit-if-no-ref/
 		flash_pins: flash-pins {
 			rockchip,pins =
 				/* flash_ale */
@@ -537,7 +498,6 @@
 	};
 
 	fspi {
-		/omit-if-no-ref/
 		fspi_pins: fspi-pins {
 			rockchip,pins =
 				/* fspi_clk */
@@ -554,7 +514,6 @@
 				<1 RK_PD4 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		fspi_cs1: fspi-cs1 {
 			rockchip,pins =
 				/* fspi_cs1n */
@@ -563,7 +522,6 @@
 	};
 
 	gmac0 {
-		/omit-if-no-ref/
 		gmac0_miim: gmac0-miim {
 			rockchip,pins =
 				/* gmac0_mdc */
@@ -572,21 +530,18 @@
 				<2 RK_PC4 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_clkinout: gmac0-clkinout {
 			rockchip,pins =
 				/* gmac0_mclkinout */
 				<2 RK_PC2 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_rx_er: gmac0-rx-er {
 			rockchip,pins =
 				/* gmac0_rxer */
 				<2 RK_PC5 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_rx_bus2: gmac0-rx-bus2 {
 			rockchip,pins =
 				/* gmac0_rxd0 */
@@ -597,7 +552,6 @@
 				<2 RK_PC0 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_tx_bus2: gmac0-tx-bus2 {
 			rockchip,pins =
 				/* gmac0_txd0 */
@@ -608,7 +562,6 @@
 				<2 RK_PB5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_rgmii_clk: gmac0-rgmii-clk {
 			rockchip,pins =
 				/* gmac0_rxclk */
@@ -617,7 +570,6 @@
 				<2 RK_PB0 2 &pcfg_pull_none_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_rgmii_bus: gmac0-rgmii-bus {
 			rockchip,pins =
 				/* gmac0_rxd2 */
@@ -632,7 +584,6 @@
 	};
 
 	gmac1 {
-		/omit-if-no-ref/
 		gmac1m0_miim: gmac1m0-miim {
 			rockchip,pins =
 				/* gmac1_mdcm0 */
@@ -641,21 +592,18 @@
 				<3 RK_PC5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_clkinout: gmac1m0-clkinout {
 			rockchip,pins =
 				/* gmac1_mclkinoutm0 */
 				<3 RK_PC0 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rx_er: gmac1m0-rx-er {
 			rockchip,pins =
 				/* gmac1_rxerm0 */
 				<3 RK_PB4 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rx_bus2: gmac1m0-rx-bus2 {
 			rockchip,pins =
 				/* gmac1_rxd0m0 */
@@ -666,7 +614,6 @@
 				<3 RK_PB3 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_tx_bus2: gmac1m0-tx-bus2 {
 			rockchip,pins =
 				/* gmac1_txd0m0 */
@@ -677,7 +624,6 @@
 				<3 RK_PB7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rgmii_clk: gmac1m0-rgmii-clk {
 			rockchip,pins =
 				/* gmac1_rxclkm0 */
@@ -686,7 +632,6 @@
 				<3 RK_PA6 3 &pcfg_pull_none_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rgmii_bus: gmac1m0-rgmii-bus {
 			rockchip,pins =
 				/* gmac1_rxd2m0 */
@@ -699,7 +644,6 @@
 				<3 RK_PA3 3 &pcfg_pull_none_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_miim: gmac1m1-miim {
 			rockchip,pins =
 				/* gmac1_mdcm1 */
@@ -708,21 +652,18 @@
 				<4 RK_PB7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_clkinout: gmac1m1-clkinout {
 			rockchip,pins =
 				/* gmac1_mclkinoutm1 */
 				<4 RK_PC1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rx_er: gmac1m1-rx-er {
 			rockchip,pins =
 				/* gmac1_rxerm1 */
 				<4 RK_PB2 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rx_bus2: gmac1m1-rx-bus2 {
 			rockchip,pins =
 				/* gmac1_rxd0m1 */
@@ -733,7 +674,6 @@
 				<4 RK_PB1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_tx_bus2: gmac1m1-tx-bus2 {
 			rockchip,pins =
 				/* gmac1_txd0m1 */
@@ -744,7 +684,6 @@
 				<4 RK_PA6 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rgmii_clk: gmac1m1-rgmii-clk {
 			rockchip,pins =
 				/* gmac1_rxclkm1 */
@@ -753,7 +692,6 @@
 				<4 RK_PA0 3 &pcfg_pull_none_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rgmii_bus: gmac1m1-rgmii-bus {
 			rockchip,pins =
 				/* gmac1_rxd2m1 */
@@ -768,7 +706,6 @@
 	};
 
 	gpu {
-		/omit-if-no-ref/
 		gpu_pins: gpu-pins {
 			rockchip,pins =
 				/* gpu_avs */
@@ -779,28 +716,24 @@
 	};
 
 	hdmitx {
-		/omit-if-no-ref/
 		hdmitxm0_cec: hdmitxm0-cec {
 			rockchip,pins =
 				/* hdmitxm0_cec */
 				<4 RK_PD1 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		hdmitxm1_cec: hdmitxm1-cec {
 			rockchip,pins =
 				/* hdmitxm1_cec */
 				<0 RK_PC7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		hdmitx_scl: hdmitx-scl {
 			rockchip,pins =
 				/* hdmitx_scl */
 				<4 RK_PC7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		hdmitx_sda: hdmitx-sda {
 			rockchip,pins =
 				/* hdmitx_sda */
@@ -809,7 +742,6 @@
 	};
 
 	i2c0 {
-		/omit-if-no-ref/
 		i2c0_xfer: i2c0-xfer {
 			rockchip,pins =
 				/* i2c0_scl */
@@ -820,7 +752,6 @@
 	};
 
 	i2c1 {
-		/omit-if-no-ref/
 		i2c1_xfer: i2c1-xfer {
 			rockchip,pins =
 				/* i2c1_scl */
@@ -831,7 +762,6 @@
 	};
 
 	i2c2 {
-		/omit-if-no-ref/
 		i2c2m0_xfer: i2c2m0-xfer {
 			rockchip,pins =
 				/* i2c2_sclm0 */
@@ -840,7 +770,6 @@
 				<0 RK_PB6 1 &pcfg_pull_none_smt>;
 		};
 
-		/omit-if-no-ref/
 		i2c2m1_xfer: i2c2m1-xfer {
 			rockchip,pins =
 				/* i2c2_sclm1 */
@@ -851,7 +780,6 @@
 	};
 
 	i2c3 {
-		/omit-if-no-ref/
 		i2c3m0_xfer: i2c3m0-xfer {
 			rockchip,pins =
 				/* i2c3_sclm0 */
@@ -860,7 +788,6 @@
 				<1 RK_PA0 1 &pcfg_pull_none_smt>;
 		};
 
-		/omit-if-no-ref/
 		i2c3m1_xfer: i2c3m1-xfer {
 			rockchip,pins =
 				/* i2c3_sclm1 */
@@ -871,7 +798,6 @@
 	};
 
 	i2c4 {
-		/omit-if-no-ref/
 		i2c4m0_xfer: i2c4m0-xfer {
 			rockchip,pins =
 				/* i2c4_sclm0 */
@@ -880,7 +806,6 @@
 				<4 RK_PB2 1 &pcfg_pull_none_smt>;
 		};
 
-		/omit-if-no-ref/
 		i2c4m1_xfer: i2c4m1-xfer {
 			rockchip,pins =
 				/* i2c4_sclm1 */
@@ -891,7 +816,6 @@
 	};
 
 	i2c5 {
-		/omit-if-no-ref/
 		i2c5m0_xfer: i2c5m0-xfer {
 			rockchip,pins =
 				/* i2c5_sclm0 */
@@ -900,7 +824,6 @@
 				<3 RK_PB4 4 &pcfg_pull_none_smt>;
 		};
 
-		/omit-if-no-ref/
 		i2c5m1_xfer: i2c5m1-xfer {
 			rockchip,pins =
 				/* i2c5_sclm1 */
@@ -911,273 +834,234 @@
 	};
 
 	i2s1 {
-		/omit-if-no-ref/
 		i2s1m0_lrckrx: i2s1m0-lrckrx {
 			rockchip,pins =
 				/* i2s1m0_lrckrx */
 				<1 RK_PA6 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_lrcktx: i2s1m0-lrcktx {
 			rockchip,pins =
 				/* i2s1m0_lrcktx */
 				<1 RK_PA5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_mclk: i2s1m0-mclk {
 			rockchip,pins =
 				/* i2s1m0_mclk */
 				<1 RK_PA2 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sclkrx: i2s1m0-sclkrx {
 			rockchip,pins =
 				/* i2s1m0_sclkrx */
 				<1 RK_PA4 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sclktx: i2s1m0-sclktx {
 			rockchip,pins =
 				/* i2s1m0_sclktx */
 				<1 RK_PA3 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdi0: i2s1m0-sdi0 {
 			rockchip,pins =
 				/* i2s1m0_sdi0 */
 				<1 RK_PB3 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdi1: i2s1m0-sdi1 {
 			rockchip,pins =
 				/* i2s1m0_sdi1 */
 				<1 RK_PB2 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdi2: i2s1m0-sdi2 {
 			rockchip,pins =
 				/* i2s1m0_sdi2 */
 				<1 RK_PB1 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdi3: i2s1m0-sdi3 {
 			rockchip,pins =
 				/* i2s1m0_sdi3 */
 				<1 RK_PB0 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdo0: i2s1m0-sdo0 {
 			rockchip,pins =
 				/* i2s1m0_sdo0 */
 				<1 RK_PA7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdo1: i2s1m0-sdo1 {
 			rockchip,pins =
 				/* i2s1m0_sdo1 */
 				<1 RK_PB0 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdo2: i2s1m0-sdo2 {
 			rockchip,pins =
 				/* i2s1m0_sdo2 */
 				<1 RK_PB1 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m0_sdo3: i2s1m0-sdo3 {
 			rockchip,pins =
 				/* i2s1m0_sdo3 */
 				<1 RK_PB2 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_lrckrx: i2s1m1-lrckrx {
 			rockchip,pins =
 				/* i2s1m1_lrckrx */
 				<4 RK_PA7 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_lrcktx: i2s1m1-lrcktx {
 			rockchip,pins =
 				/* i2s1m1_lrcktx */
 				<3 RK_PD0 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_mclk: i2s1m1-mclk {
 			rockchip,pins =
 				/* i2s1m1_mclk */
 				<3 RK_PC6 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sclkrx: i2s1m1-sclkrx {
 			rockchip,pins =
 				/* i2s1m1_sclkrx */
 				<4 RK_PA6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sclktx: i2s1m1-sclktx {
 			rockchip,pins =
 				/* i2s1m1_sclktx */
 				<3 RK_PC7 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdi0: i2s1m1-sdi0 {
 			rockchip,pins =
 				/* i2s1m1_sdi0 */
 				<3 RK_PD2 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdi1: i2s1m1-sdi1 {
 			rockchip,pins =
 				/* i2s1m1_sdi1 */
 				<3 RK_PD3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdi2: i2s1m1-sdi2 {
 			rockchip,pins =
 				/* i2s1m1_sdi2 */
 				<3 RK_PD4 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdi3: i2s1m1-sdi3 {
 			rockchip,pins =
 				/* i2s1m1_sdi3 */
 				<3 RK_PD5 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdo0: i2s1m1-sdo0 {
 			rockchip,pins =
 				/* i2s1m1_sdo0 */
 				<3 RK_PD1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdo1: i2s1m1-sdo1 {
 			rockchip,pins =
 				/* i2s1m1_sdo1 */
 				<4 RK_PB0 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdo2: i2s1m1-sdo2 {
 			rockchip,pins =
 				/* i2s1m1_sdo2 */
 				<4 RK_PB1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m1_sdo3: i2s1m1-sdo3 {
 			rockchip,pins =
 				/* i2s1m1_sdo3 */
 				<4 RK_PB5 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_lrckrx: i2s1m2-lrckrx {
 			rockchip,pins =
 				/* i2s1m2_lrckrx */
 				<3 RK_PC5 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_lrcktx: i2s1m2-lrcktx {
 			rockchip,pins =
 				/* i2s1m2_lrcktx */
 				<2 RK_PD2 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_mclk: i2s1m2-mclk {
 			rockchip,pins =
 				/* i2s1m2_mclk */
 				<2 RK_PD0 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sclkrx: i2s1m2-sclkrx {
 			rockchip,pins =
 				/* i2s1m2_sclkrx */
 				<3 RK_PC3 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sclktx: i2s1m2-sclktx {
 			rockchip,pins =
 				/* i2s1m2_sclktx */
 				<2 RK_PD1 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdi0: i2s1m2-sdi0 {
 			rockchip,pins =
 				/* i2s1m2_sdi0 */
 				<2 RK_PD3 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdi1: i2s1m2-sdi1 {
 			rockchip,pins =
 				/* i2s1m2_sdi1 */
 				<2 RK_PD4 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdi2: i2s1m2-sdi2 {
 			rockchip,pins =
 				/* i2s1m2_sdi2 */
 				<2 RK_PD5 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdi3: i2s1m2-sdi3 {
 			rockchip,pins =
 				/* i2s1m2_sdi3 */
 				<2 RK_PD6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdo0: i2s1m2-sdo0 {
 			rockchip,pins =
 				/* i2s1m2_sdo0 */
 				<2 RK_PD7 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdo1: i2s1m2-sdo1 {
 			rockchip,pins =
 				/* i2s1m2_sdo1 */
 				<3 RK_PA0 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdo2: i2s1m2-sdo2 {
 			rockchip,pins =
 				/* i2s1m2_sdo2 */
 				<3 RK_PC1 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s1m2_sdo3: i2s1m2-sdo3 {
 			rockchip,pins =
 				/* i2s1m2_sdo3 */
@@ -1186,98 +1070,84 @@
 	};
 
 	i2s2 {
-		/omit-if-no-ref/
 		i2s2m0_lrckrx: i2s2m0-lrckrx {
 			rockchip,pins =
 				/* i2s2m0_lrckrx */
 				<2 RK_PC0 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_lrcktx: i2s2m0-lrcktx {
 			rockchip,pins =
 				/* i2s2m0_lrcktx */
 				<2 RK_PC3 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_mclk: i2s2m0-mclk {
 			rockchip,pins =
 				/* i2s2m0_mclk */
 				<2 RK_PC1 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_sclkrx: i2s2m0-sclkrx {
 			rockchip,pins =
 				/* i2s2m0_sclkrx */
 				<2 RK_PB7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_sclktx: i2s2m0-sclktx {
 			rockchip,pins =
 				/* i2s2m0_sclktx */
 				<2 RK_PC2 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_sdi: i2s2m0-sdi {
 			rockchip,pins =
 				/* i2s2m0_sdi */
 				<2 RK_PC5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m0_sdo: i2s2m0-sdo {
 			rockchip,pins =
 				/* i2s2m0_sdo */
 				<2 RK_PC4 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_lrckrx: i2s2m1-lrckrx {
 			rockchip,pins =
 				/* i2s2m1_lrckrx */
 				<4 RK_PA5 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_lrcktx: i2s2m1-lrcktx {
 			rockchip,pins =
 				/* i2s2m1_lrcktx */
 				<4 RK_PA4 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_mclk: i2s2m1-mclk {
 			rockchip,pins =
 				/* i2s2m1_mclk */
 				<4 RK_PB6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_sclkrx: i2s2m1-sclkrx {
 			rockchip,pins =
 				/* i2s2m1_sclkrx */
 				<4 RK_PC1 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_sclktx: i2s2m1-sclktx {
 			rockchip,pins =
 				/* i2s2m1_sclktx */
 				<4 RK_PB7 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_sdi: i2s2m1-sdi {
 			rockchip,pins =
 				/* i2s2m1_sdi */
 				<4 RK_PB2 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s2m1_sdo: i2s2m1-sdo {
 			rockchip,pins =
 				/* i2s2m1_sdo */
@@ -1286,70 +1156,60 @@
 	};
 
 	i2s3 {
-		/omit-if-no-ref/
 		i2s3m0_lrck: i2s3m0-lrck {
 			rockchip,pins =
 				/* i2s3m0_lrck */
 				<3 RK_PA4 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m0_mclk: i2s3m0-mclk {
 			rockchip,pins =
 				/* i2s3m0_mclk */
 				<3 RK_PA2 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m0_sclk: i2s3m0-sclk {
 			rockchip,pins =
 				/* i2s3m0_sclk */
 				<3 RK_PA3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m0_sdi: i2s3m0-sdi {
 			rockchip,pins =
 				/* i2s3m0_sdi */
 				<3 RK_PA6 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m0_sdo: i2s3m0-sdo {
 			rockchip,pins =
 				/* i2s3m0_sdo */
 				<3 RK_PA5 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m1_lrck: i2s3m1-lrck {
 			rockchip,pins =
 				/* i2s3m1_lrck */
 				<4 RK_PC4 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m1_mclk: i2s3m1-mclk {
 			rockchip,pins =
 				/* i2s3m1_mclk */
 				<4 RK_PC2 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m1_sclk: i2s3m1-sclk {
 			rockchip,pins =
 				/* i2s3m1_sclk */
 				<4 RK_PC3 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m1_sdi: i2s3m1-sdi {
 			rockchip,pins =
 				/* i2s3m1_sdi */
 				<4 RK_PC6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		i2s3m1_sdo: i2s3m1-sdo {
 			rockchip,pins =
 				/* i2s3m1_sdo */
@@ -1358,7 +1218,6 @@
 	};
 
 	isp {
-		/omit-if-no-ref/
 		isp_pins: isp-pins {
 			rockchip,pins =
 				/* isp_flashtrigin */
@@ -1371,7 +1230,6 @@
 	};
 
 	jtag {
-		/omit-if-no-ref/
 		jtag_pins: jtag-pins {
 			rockchip,pins =
 				/* jtag_tck */
@@ -1382,7 +1240,6 @@
 	};
 
 	lcdc {
-		/omit-if-no-ref/
 		lcdc_ctl: lcdc-ctl {
 			rockchip,pins =
 				/* lcdc_clk */
@@ -1445,7 +1302,6 @@
 	};
 
 	mcu {
-		/omit-if-no-ref/
 		mcu_pins: mcu-pins {
 			rockchip,pins =
 				/* mcu_jtagtck */
@@ -1462,7 +1318,6 @@
 	};
 
 	npu {
-		/omit-if-no-ref/
 		npu_pins: npu-pins {
 			rockchip,pins =
 				/* npu_avs */
@@ -1471,7 +1326,6 @@
 	};
 
 	pcie20 {
-		/omit-if-no-ref/
 		pcie20m0_pins: pcie20m0-pins {
 			rockchip,pins =
 				/* pcie20_clkreqnm0 */
@@ -1482,7 +1336,6 @@
 				<0 RK_PB5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie20m1_pins: pcie20m1-pins {
 			rockchip,pins =
 				/* pcie20_clkreqnm1 */
@@ -1493,7 +1346,6 @@
 				<2 RK_PD1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie20m2_pins: pcie20m2-pins {
 			rockchip,pins =
 				/* pcie20_clkreqnm2 */
@@ -1504,7 +1356,6 @@
 				<1 RK_PB1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie20_buttonrstn: pcie20-buttonrstn {
 			rockchip,pins =
 				/* pcie20_buttonrstn */
@@ -1513,7 +1364,6 @@
 	};
 
 	pcie30x1 {
-		/omit-if-no-ref/
 		pcie30x1m0_pins: pcie30x1m0-pins {
 			rockchip,pins =
 				/* pcie30x1_clkreqnm0 */
@@ -1524,7 +1374,6 @@
 				<0 RK_PC2 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x1m1_pins: pcie30x1m1-pins {
 			rockchip,pins =
 				/* pcie30x1_clkreqnm1 */
@@ -1535,7 +1384,6 @@
 				<2 RK_PD3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x1m2_pins: pcie30x1m2-pins {
 			rockchip,pins =
 				/* pcie30x1_clkreqnm2 */
@@ -1546,7 +1394,6 @@
 				<1 RK_PA3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x1_buttonrstn: pcie30x1-buttonrstn {
 			rockchip,pins =
 				/* pcie30x1_buttonrstn */
@@ -1555,7 +1402,6 @@
 	};
 
 	pcie30x2 {
-		/omit-if-no-ref/
 		pcie30x2m0_pins: pcie30x2m0-pins {
 			rockchip,pins =
 				/* pcie30x2_clkreqnm0 */
@@ -1566,7 +1412,6 @@
 				<0 RK_PC5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x2m1_pins: pcie30x2m1-pins {
 			rockchip,pins =
 				/* pcie30x2_clkreqnm1 */
@@ -1577,7 +1422,6 @@
 				<2 RK_PD5 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x2m2_pins: pcie30x2m2-pins {
 			rockchip,pins =
 				/* pcie30x2_clkreqnm2 */
@@ -1588,7 +1432,6 @@
 				<4 RK_PC3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pcie30x2_buttonrstn: pcie30x2-buttonrstn {
 			rockchip,pins =
 				/* pcie30x2_buttonrstn */
@@ -1597,119 +1440,102 @@
 	};
 
 	pdm {
-		/omit-if-no-ref/
 		pdmm0_clk: pdmm0-clk {
 			rockchip,pins =
 				/* pdm_clk0m0 */
 				<1 RK_PA6 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm0_clk1: pdmm0-clk1 {
 			rockchip,pins =
 				/* pdmm0_clk1 */
 				<1 RK_PA4 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm0_sdi0: pdmm0-sdi0 {
 			rockchip,pins =
 				/* pdmm0_sdi0 */
 				<1 RK_PB3 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm0_sdi1: pdmm0-sdi1 {
 			rockchip,pins =
 				/* pdmm0_sdi1 */
 				<1 RK_PB2 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm0_sdi2: pdmm0-sdi2 {
 			rockchip,pins =
 				/* pdmm0_sdi2 */
 				<1 RK_PB1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm0_sdi3: pdmm0-sdi3 {
 			rockchip,pins =
 				/* pdmm0_sdi3 */
 				<1 RK_PB0 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_clk: pdmm1-clk {
 			rockchip,pins =
 				/* pdm_clk0m1 */
 				<3 RK_PD6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_clk1: pdmm1-clk1 {
 			rockchip,pins =
 				/* pdmm1_clk1 */
 				<4 RK_PA0 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_sdi0: pdmm1-sdi0 {
 			rockchip,pins =
 				/* pdmm1_sdi0 */
 				<3 RK_PD7 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_sdi1: pdmm1-sdi1 {
 			rockchip,pins =
 				/* pdmm1_sdi1 */
 				<4 RK_PA1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_sdi2: pdmm1-sdi2 {
 			rockchip,pins =
 				/* pdmm1_sdi2 */
 				<4 RK_PA2 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm1_sdi3: pdmm1-sdi3 {
 			rockchip,pins =
 				/* pdmm1_sdi3 */
 				<4 RK_PA3 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm2_clk1: pdmm2-clk1 {
 			rockchip,pins =
 				/* pdmm2_clk1 */
 				<3 RK_PC4 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm2_sdi0: pdmm2-sdi0 {
 			rockchip,pins =
 				/* pdmm2_sdi0 */
 				<3 RK_PB3 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm2_sdi1: pdmm2-sdi1 {
 			rockchip,pins =
 				/* pdmm2_sdi1 */
 				<3 RK_PB4 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm2_sdi2: pdmm2-sdi2 {
 			rockchip,pins =
 				/* pdmm2_sdi2 */
 				<3 RK_PB7 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pdmm2_sdi3: pdmm2-sdi3 {
 			rockchip,pins =
 				/* pdmm2_sdi3 */
@@ -1718,7 +1544,6 @@
 	};
 
 	pmic {
-		/omit-if-no-ref/
 		pmic_pins: pmic-pins {
 			rockchip,pins =
 				/* pmic_sleep */
@@ -1727,7 +1552,6 @@
 	};
 
 	pmu {
-		/omit-if-no-ref/
 		pmu_pins: pmu-pins {
 			rockchip,pins =
 				/* pmu_debug0 */
@@ -1746,14 +1570,12 @@
 	};
 
 	pwm0 {
-		/omit-if-no-ref/
 		pwm0m0_pins: pwm0m0-pins {
 			rockchip,pins =
 				/* pwm0_m0 */
 				<0 RK_PB7 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm0m1_pins: pwm0m1-pins {
 			rockchip,pins =
 				/* pwm0_m1 */
@@ -1762,14 +1584,12 @@
 	};
 
 	pwm1 {
-		/omit-if-no-ref/
 		pwm1m0_pins: pwm1m0-pins {
 			rockchip,pins =
 				/* pwm1_m0 */
 				<0 RK_PC0 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm1m1_pins: pwm1m1-pins {
 			rockchip,pins =
 				/* pwm1_m1 */
@@ -1778,14 +1598,12 @@
 	};
 
 	pwm2 {
-		/omit-if-no-ref/
 		pwm2m0_pins: pwm2m0-pins {
 			rockchip,pins =
 				/* pwm2_m0 */
 				<0 RK_PC1 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm2m1_pins: pwm2m1-pins {
 			rockchip,pins =
 				/* pwm2_m1 */
@@ -1794,7 +1612,6 @@
 	};
 
 	pwm3 {
-		/omit-if-no-ref/
 		pwm3_pins: pwm3-pins {
 			rockchip,pins =
 				/* pwm3_ir */
@@ -1803,7 +1620,6 @@
 	};
 
 	pwm4 {
-		/omit-if-no-ref/
 		pwm4_pins: pwm4-pins {
 			rockchip,pins =
 				/* pwm4 */
@@ -1812,7 +1628,6 @@
 	};
 
 	pwm5 {
-		/omit-if-no-ref/
 		pwm5_pins: pwm5-pins {
 			rockchip,pins =
 				/* pwm5 */
@@ -1821,7 +1636,6 @@
 	};
 
 	pwm6 {
-		/omit-if-no-ref/
 		pwm6_pins: pwm6-pins {
 			rockchip,pins =
 				/* pwm6 */
@@ -1830,7 +1644,6 @@
 	};
 
 	pwm7 {
-		/omit-if-no-ref/
 		pwm7_pins: pwm7-pins {
 			rockchip,pins =
 				/* pwm7_ir */
@@ -1839,14 +1652,12 @@
 	};
 
 	pwm8 {
-		/omit-if-no-ref/
 		pwm8m0_pins: pwm8m0-pins {
 			rockchip,pins =
 				/* pwm8_m0 */
 				<3 RK_PB1 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm8m1_pins: pwm8m1-pins {
 			rockchip,pins =
 				/* pwm8_m1 */
@@ -1855,14 +1666,12 @@
 	};
 
 	pwm9 {
-		/omit-if-no-ref/
 		pwm9m0_pins: pwm9m0-pins {
 			rockchip,pins =
 				/* pwm9_m0 */
 				<3 RK_PB2 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm9m1_pins: pwm9m1-pins {
 			rockchip,pins =
 				/* pwm9_m1 */
@@ -1871,14 +1680,12 @@
 	};
 
 	pwm10 {
-		/omit-if-no-ref/
 		pwm10m0_pins: pwm10m0-pins {
 			rockchip,pins =
 				/* pwm10_m0 */
 				<3 RK_PB5 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm10m1_pins: pwm10m1-pins {
 			rockchip,pins =
 				/* pwm10_m1 */
@@ -1887,14 +1694,12 @@
 	};
 
 	pwm11 {
-		/omit-if-no-ref/
 		pwm11m0_pins: pwm11m0-pins {
 			rockchip,pins =
 				/* pwm11_irm0 */
 				<3 RK_PB6 5 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm11m1_pins: pwm11m1-pins {
 			rockchip,pins =
 				/* pwm11_irm1 */
@@ -1903,14 +1708,12 @@
 	};
 
 	pwm12 {
-		/omit-if-no-ref/
 		pwm12m0_pins: pwm12m0-pins {
 			rockchip,pins =
 				/* pwm12_m0 */
 				<3 RK_PB7 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm12m1_pins: pwm12m1-pins {
 			rockchip,pins =
 				/* pwm12_m1 */
@@ -1919,14 +1722,12 @@
 	};
 
 	pwm13 {
-		/omit-if-no-ref/
 		pwm13m0_pins: pwm13m0-pins {
 			rockchip,pins =
 				/* pwm13_m0 */
 				<3 RK_PC0 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm13m1_pins: pwm13m1-pins {
 			rockchip,pins =
 				/* pwm13_m1 */
@@ -1935,14 +1736,12 @@
 	};
 
 	pwm14 {
-		/omit-if-no-ref/
 		pwm14m0_pins: pwm14m0-pins {
 			rockchip,pins =
 				/* pwm14_m0 */
 				<3 RK_PC4 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm14m1_pins: pwm14m1-pins {
 			rockchip,pins =
 				/* pwm14_m1 */
@@ -1951,14 +1750,12 @@
 	};
 
 	pwm15 {
-		/omit-if-no-ref/
 		pwm15m0_pins: pwm15m0-pins {
 			rockchip,pins =
 				/* pwm15_irm0 */
 				<3 RK_PC5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		pwm15m1_pins: pwm15m1-pins {
 			rockchip,pins =
 				/* pwm15_irm1 */
@@ -1967,7 +1764,6 @@
 	};
 
 	refclk {
-		/omit-if-no-ref/
 		refclk_pins: refclk-pins {
 			rockchip,pins =
 				/* refclk_ou */
@@ -1976,7 +1772,6 @@
 	};
 
 	sata {
-		/omit-if-no-ref/
 		sata_pins: sata-pins {
 			rockchip,pins =
 				/* sata_cpdet */
@@ -1989,7 +1784,6 @@
 	};
 
 	sata0 {
-		/omit-if-no-ref/
 		sata0_pins: sata0-pins {
 			rockchip,pins =
 				/* sata0_actled */
@@ -1998,7 +1792,6 @@
 	};
 
 	sata1 {
-		/omit-if-no-ref/
 		sata1_pins: sata1-pins {
 			rockchip,pins =
 				/* sata1_actled */
@@ -2007,7 +1800,6 @@
 	};
 
 	sata2 {
-		/omit-if-no-ref/
 		sata2_pins: sata2-pins {
 			rockchip,pins =
 				/* sata2_actled */
@@ -2016,7 +1808,6 @@
 	};
 
 	scr {
-		/omit-if-no-ref/
 		scr_pins: scr-pins {
 			rockchip,pins =
 				/* scr_clk */
@@ -2031,7 +1822,6 @@
 	};
 
 	sdmmc0 {
-		/omit-if-no-ref/
 		sdmmc0_bus4: sdmmc0-bus4 {
 			rockchip,pins =
 				/* sdmmc0_d0 */
@@ -2044,28 +1834,24 @@
 				<2 RK_PA0 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc0_clk: sdmmc0-clk {
 			rockchip,pins =
 				/* sdmmc0_clk */
 				<2 RK_PA2 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc0_cmd: sdmmc0-cmd {
 			rockchip,pins =
 				/* sdmmc0_cmd */
 				<2 RK_PA1 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc0_det: sdmmc0-det {
 			rockchip,pins =
 				/* sdmmc0_det */
 				<0 RK_PA4 1 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc0_pwren: sdmmc0-pwren {
 			rockchip,pins =
 				/* sdmmc0_pwren */
@@ -2074,7 +1860,6 @@
 	};
 
 	sdmmc1 {
-		/omit-if-no-ref/
 		sdmmc1_bus4: sdmmc1-bus4 {
 			rockchip,pins =
 				/* sdmmc1_d0 */
@@ -2087,28 +1872,24 @@
 				<2 RK_PA6 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc1_clk: sdmmc1-clk {
 			rockchip,pins =
 				/* sdmmc1_clk */
 				<2 RK_PB0 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc1_cmd: sdmmc1-cmd {
 			rockchip,pins =
 				/* sdmmc1_cmd */
 				<2 RK_PA7 1 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc1_det: sdmmc1-det {
 			rockchip,pins =
 				/* sdmmc1_det */
 				<2 RK_PB2 1 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc1_pwren: sdmmc1-pwren {
 			rockchip,pins =
 				/* sdmmc1_pwren */
@@ -2117,7 +1898,6 @@
 	};
 
 	sdmmc2 {
-		/omit-if-no-ref/
 		sdmmc2m0_bus4: sdmmc2m0-bus4 {
 			rockchip,pins =
 				/* sdmmc2_d0m0 */
@@ -2130,35 +1910,30 @@
 				<3 RK_PD1 3 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m0_clk: sdmmc2m0-clk {
 			rockchip,pins =
 				/* sdmmc2_clkm0 */
 				<3 RK_PD3 3 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m0_cmd: sdmmc2m0-cmd {
 			rockchip,pins =
 				/* sdmmc2_cmdm0 */
 				<3 RK_PD2 3 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m0_det: sdmmc2m0-det {
 			rockchip,pins =
 				/* sdmmc2_detm0 */
 				<3 RK_PD4 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m0_pwren: sdmmc2m0-pwren {
 			rockchip,pins =
 				/* sdmmc2m0_pwren */
 				<3 RK_PD5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m1_bus4: sdmmc2m1-bus4 {
 			rockchip,pins =
 				/* sdmmc2_d0m1 */
@@ -2171,28 +1946,24 @@
 				<3 RK_PA4 5 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m1_clk: sdmmc2m1-clk {
 			rockchip,pins =
 				/* sdmmc2_clkm1 */
 				<3 RK_PA6 5 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m1_cmd: sdmmc2m1-cmd {
 			rockchip,pins =
 				/* sdmmc2_cmdm1 */
 				<3 RK_PA5 5 &pcfg_pull_up_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m1_det: sdmmc2m1-det {
 			rockchip,pins =
 				/* sdmmc2_detm1 */
 				<3 RK_PA7 4 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		sdmmc2m1_pwren: sdmmc2m1-pwren {
 			rockchip,pins =
 				/* sdmmc2m1_pwren */
@@ -2201,21 +1972,18 @@
 	};
 
 	spdif {
-		/omit-if-no-ref/
 		spdifm0_tx: spdifm0-tx {
 			rockchip,pins =
 				/* spdifm0_tx */
 				<1 RK_PA4 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spdifm1_tx: spdifm1-tx {
 			rockchip,pins =
 				/* spdifm1_tx */
 				<3 RK_PC5 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spdifm2_tx: spdifm2-tx {
 			rockchip,pins =
 				/* spdifm2_tx */
@@ -2224,7 +1992,6 @@
 	};
 
 	spi0 {
-		/omit-if-no-ref/
 		spi0m0_pins: spi0m0-pins {
 			rockchip,pins =
 				/* spi0_clkm0 */
@@ -2235,21 +2002,18 @@
 				<0 RK_PB6 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi0m0_cs0: spi0m0-cs0 {
 			rockchip,pins =
 				/* spi0_cs0m0 */
 				<0 RK_PC6 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi0m0_cs1: spi0m0-cs1 {
 			rockchip,pins =
 				/* spi0_cs1m0 */
 				<0 RK_PC4 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi0m1_pins: spi0m1-pins {
 			rockchip,pins =
 				/* spi0_clkm1 */
@@ -2260,7 +2024,6 @@
 				<2 RK_PD1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi0m1_cs0: spi0m1-cs0 {
 			rockchip,pins =
 				/* spi0_cs0m1 */
@@ -2269,7 +2032,6 @@
 	};
 
 	spi1 {
-		/omit-if-no-ref/
 		spi1m0_pins: spi1m0-pins {
 			rockchip,pins =
 				/* spi1_clkm0 */
@@ -2280,21 +2042,18 @@
 				<2 RK_PB7 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi1m0_cs0: spi1m0-cs0 {
 			rockchip,pins =
 				/* spi1_cs0m0 */
 				<2 RK_PC0 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi1m0_cs1: spi1m0-cs1 {
 			rockchip,pins =
 				/* spi1_cs1m0 */
 				<2 RK_PC6 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi1m1_pins: spi1m1-pins {
 			rockchip,pins =
 				/* spi1_clkm1 */
@@ -2305,7 +2064,6 @@
 				<3 RK_PC1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi1m1_cs0: spi1m1-cs0 {
 			rockchip,pins =
 				/* spi1_cs0m1 */
@@ -2314,7 +2072,6 @@
 	};
 
 	spi2 {
-		/omit-if-no-ref/
 		spi2m0_pins: spi2m0-pins {
 			rockchip,pins =
 				/* spi2_clkm0 */
@@ -2325,21 +2082,18 @@
 				<2 RK_PC3 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi2m0_cs0: spi2m0-cs0 {
 			rockchip,pins =
 				/* spi2_cs0m0 */
 				<2 RK_PC4 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi2m0_cs1: spi2m0-cs1 {
 			rockchip,pins =
 				/* spi2_cs1m0 */
 				<2 RK_PC5 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_pins: spi2m1-pins {
 			rockchip,pins =
 				/* spi2_clkm1 */
@@ -2350,14 +2104,12 @@
 				<2 RK_PD6 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_cs0: spi2m1-cs0 {
 			rockchip,pins =
 				/* spi2_cs0m1 */
 				<2 RK_PD5 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_cs1: spi2m1-cs1 {
 			rockchip,pins =
 				/* spi2_cs1m1 */
@@ -2366,7 +2118,6 @@
 	};
 
 	spi3 {
-		/omit-if-no-ref/
 		spi3m0_pins: spi3m0-pins {
 			rockchip,pins =
 				/* spi3_clkm0 */
@@ -2377,21 +2128,18 @@
 				<4 RK_PB2 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi3m0_cs0: spi3m0-cs0 {
 			rockchip,pins =
 				/* spi3_cs0m0 */
 				<4 RK_PA6 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi3m0_cs1: spi3m0-cs1 {
 			rockchip,pins =
 				/* spi3_cs1m0 */
 				<4 RK_PA7 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_pins: spi3m1-pins {
 			rockchip,pins =
 				/* spi3_clkm1 */
@@ -2402,14 +2150,12 @@
 				<4 RK_PC3 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_cs0: spi3m1-cs0 {
 			rockchip,pins =
 				/* spi3_cs0m1 */
 				<4 RK_PC6 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_cs1: spi3m1-cs1 {
 			rockchip,pins =
 				/* spi3_cs1m1 */
@@ -2418,21 +2164,18 @@
 	};
 
 	tsadc {
-		/omit-if-no-ref/
 		tsadcm0_shut: tsadcm0-shut {
 			rockchip,pins =
 				/* tsadcm0_shut */
 				<0 RK_PA1 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		tsadcm1_shut: tsadcm1-shut {
 			rockchip,pins =
 				/* tsadcm1_shut */
 				<0 RK_PA2 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		tsadc_shutorg: tsadc-shutorg {
 			rockchip,pins =
 				/* tsadc_shutorg */
@@ -2441,7 +2184,6 @@
 	};
 
 	uart0 {
-		/omit-if-no-ref/
 		uart0_xfer: uart0-xfer {
 			rockchip,pins =
 				/* uart0_rx */
@@ -2450,14 +2192,12 @@
 				<0 RK_PC1 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart0_ctsn: uart0-ctsn {
 			rockchip,pins =
 				/* uart0_ctsn */
 				<0 RK_PC7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart0_rtsn: uart0-rtsn {
 			rockchip,pins =
 				/* uart0_rtsn */
@@ -2466,7 +2206,6 @@
 	};
 
 	uart1 {
-		/omit-if-no-ref/
 		uart1m0_xfer: uart1m0-xfer {
 			rockchip,pins =
 				/* uart1_rxm0 */
@@ -2475,21 +2214,18 @@
 				<2 RK_PB4 2 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart1m0_ctsn: uart1m0-ctsn {
 			rockchip,pins =
 				/* uart1m0_ctsn */
 				<2 RK_PB6 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart1m0_rtsn: uart1m0-rtsn {
 			rockchip,pins =
 				/* uart1m0_rtsn */
 				<2 RK_PB5 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart1m1_xfer: uart1m1-xfer {
 			rockchip,pins =
 				/* uart1_rxm1 */
@@ -2498,14 +2234,12 @@
 				<3 RK_PD6 4 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart1m1_ctsn: uart1m1-ctsn {
 			rockchip,pins =
 				/* uart1m1_ctsn */
 				<4 RK_PC1 4 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart1m1_rtsn: uart1m1-rtsn {
 			rockchip,pins =
 				/* uart1m1_rtsn */
@@ -2514,7 +2248,6 @@
 	};
 
 	uart2 {
-		/omit-if-no-ref/
 		uart2m0_xfer: uart2m0-xfer {
 			rockchip,pins =
 				/* uart2_rxm0 */
@@ -2523,7 +2256,6 @@
 				<0 RK_PD1 1 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart2m1_xfer: uart2m1-xfer {
 			rockchip,pins =
 				/* uart2_rxm1 */
@@ -2534,7 +2266,6 @@
 	};
 
 	uart3 {
-		/omit-if-no-ref/
 		uart3m0_xfer: uart3m0-xfer {
 			rockchip,pins =
 				/* uart3_rxm0 */
@@ -2543,21 +2274,18 @@
 				<1 RK_PA1 2 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart3m0_ctsn: uart3m0-ctsn {
 			rockchip,pins =
 				/* uart3m0_ctsn */
 				<1 RK_PA3 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart3m0_rtsn: uart3m0-rtsn {
 			rockchip,pins =
 				/* uart3m0_rtsn */
 				<1 RK_PA2 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart3m1_xfer: uart3m1-xfer {
 			rockchip,pins =
 				/* uart3_rxm1 */
@@ -2568,7 +2296,6 @@
 	};
 
 	uart4 {
-		/omit-if-no-ref/
 		uart4m0_xfer: uart4m0-xfer {
 			rockchip,pins =
 				/* uart4_rxm0 */
@@ -2577,21 +2304,18 @@
 				<1 RK_PA6 2 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart4m0_ctsn: uart4m0-ctsn {
 			rockchip,pins =
 				/* uart4m0_ctsn */
 				<1 RK_PA7 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart4m0_rtsn: uart4m0-rtsn {
 			rockchip,pins =
 				/* uart4m0_rtsn */
 				<1 RK_PA5 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart4m1_xfer: uart4m1-xfer {
 			rockchip,pins =
 				/* uart4_rxm1 */
@@ -2602,7 +2326,6 @@
 	};
 
 	uart5 {
-		/omit-if-no-ref/
 		uart5m0_xfer: uart5m0-xfer {
 			rockchip,pins =
 				/* uart5_rxm0 */
@@ -2611,21 +2334,18 @@
 				<2 RK_PA2 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart5m0_ctsn: uart5m0-ctsn {
 			rockchip,pins =
 				/* uart5m0_ctsn */
 				<1 RK_PD7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart5m0_rtsn: uart5m0-rtsn {
 			rockchip,pins =
 				/* uart5m0_rtsn */
 				<2 RK_PA0 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart5m1_xfer: uart5m1-xfer {
 			rockchip,pins =
 				/* uart5_rxm1 */
@@ -2636,7 +2356,6 @@
 	};
 
 	uart6 {
-		/omit-if-no-ref/
 		uart6m0_xfer: uart6m0-xfer {
 			rockchip,pins =
 				/* uart6_rxm0 */
@@ -2645,21 +2364,18 @@
 				<2 RK_PA4 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart6m0_ctsn: uart6m0-ctsn {
 			rockchip,pins =
 				/* uart6m0_ctsn */
 				<2 RK_PC0 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart6m0_rtsn: uart6m0-rtsn {
 			rockchip,pins =
 				/* uart6m0_rtsn */
 				<2 RK_PB7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart6m1_xfer: uart6m1-xfer {
 			rockchip,pins =
 				/* uart6_rxm1 */
@@ -2670,7 +2386,6 @@
 	};
 
 	uart7 {
-		/omit-if-no-ref/
 		uart7m0_xfer: uart7m0-xfer {
 			rockchip,pins =
 				/* uart7_rxm0 */
@@ -2679,21 +2394,18 @@
 				<2 RK_PA6 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart7m0_ctsn: uart7m0-ctsn {
 			rockchip,pins =
 				/* uart7m0_ctsn */
 				<2 RK_PC2 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart7m0_rtsn: uart7m0-rtsn {
 			rockchip,pins =
 				/* uart7m0_rtsn */
 				<2 RK_PC1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart7m1_xfer: uart7m1-xfer {
 			rockchip,pins =
 				/* uart7_rxm1 */
@@ -2702,7 +2414,6 @@
 				<3 RK_PC4 4 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart7m2_xfer: uart7m2-xfer {
 			rockchip,pins =
 				/* uart7_rxm2 */
@@ -2713,7 +2424,6 @@
 	};
 
 	uart8 {
-		/omit-if-no-ref/
 		uart8m0_xfer: uart8m0-xfer {
 			rockchip,pins =
 				/* uart8_rxm0 */
@@ -2722,21 +2432,18 @@
 				<2 RK_PC5 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart8m0_ctsn: uart8m0-ctsn {
 			rockchip,pins =
 				/* uart8m0_ctsn */
 				<2 RK_PB2 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart8m0_rtsn: uart8m0-rtsn {
 			rockchip,pins =
 				/* uart8m0_rtsn */
 				<2 RK_PB1 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart8m1_xfer: uart8m1-xfer {
 			rockchip,pins =
 				/* uart8_rxm1 */
@@ -2747,7 +2454,6 @@
 	};
 
 	uart9 {
-		/omit-if-no-ref/
 		uart9m0_xfer: uart9m0-xfer {
 			rockchip,pins =
 				/* uart9_rxm0 */
@@ -2756,21 +2462,18 @@
 				<2 RK_PB0 3 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart9m0_ctsn: uart9m0-ctsn {
 			rockchip,pins =
 				/* uart9m0_ctsn */
 				<2 RK_PC4 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart9m0_rtsn: uart9m0-rtsn {
 			rockchip,pins =
 				/* uart9m0_rtsn */
 				<2 RK_PC3 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		uart9m1_xfer: uart9m1-xfer {
 			rockchip,pins =
 				/* uart9_rxm1 */
@@ -2779,7 +2482,6 @@
 				<4 RK_PC5 4 &pcfg_pull_up>;
 		};
 
-		/omit-if-no-ref/
 		uart9m2_xfer: uart9m2-xfer {
 			rockchip,pins =
 				/* uart9_rxm2 */
@@ -2790,14 +2492,12 @@
 	};
 
 	vop {
-		/omit-if-no-ref/
 		vopm0_pins: vopm0-pins {
 			rockchip,pins =
 				/* vop_pwmm0 */
 				<0 RK_PC3 2 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		vopm1_pins: vopm1-pins {
 			rockchip,pins =
 				/* vop_pwmm1 */
@@ -2811,7 +2511,6 @@
  */
 &pinctrl {
 	spi0-hs {
-		/omit-if-no-ref/
 		spi0m0_pins_hs: spi0m0-pins {
 			rockchip,pins =
 				/* spi0_clkm0 */
@@ -2822,21 +2521,18 @@
 				<0 RK_PB6 2 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi0m0_cs0_hs: spi0m0-cs0 {
 			rockchip,pins =
 				/* spi0_cs0m0 */
 				<0 RK_PC6 2 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi0m0_cs1_hs: spi0m0-cs1 {
 			rockchip,pins =
 				/* spi0_cs1m0 */
 				<0 RK_PC4 2 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi0m1_pins_hs: spi0m1-pins {
 			rockchip,pins =
 				/* spi0_clkm1 */
@@ -2847,7 +2543,6 @@
 				<2 RK_PD1 3 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi0m1_cs0_hs: spi0m1-cs0 {
 			rockchip,pins =
 				/* spi0_cs0m1 */
@@ -2856,7 +2551,6 @@
 	};
 
 	spi1-hs {
-		/omit-if-no-ref/
 		spi1m0_pins_hs: spi1m0-pins {
 			rockchip,pins =
 				/* spi1_clkm0 */
@@ -2867,21 +2561,18 @@
 				<2 RK_PB7 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi1m0_cs0_hs: spi1m0-cs0 {
 			rockchip,pins =
 				/* spi1_cs0m0 */
 				<2 RK_PC0 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi1m0_cs1_hs: spi1m0-cs1 {
 			rockchip,pins =
 				/* spi1_cs1m0 */
 				<2 RK_PC6 3 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi1m1_pins_hs: spi1m1-pins {
 			rockchip,pins =
 				/* spi1_clkm1 */
@@ -2892,7 +2583,6 @@
 				<3 RK_PC1 3 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi1m1_cs0_hs: spi1m1-cs0 {
 			rockchip,pins =
 				/* spi1_cs0m1 */
@@ -2901,7 +2591,6 @@
 	};
 
 	spi2-hs {
-		/omit-if-no-ref/
 		spi2m0_pins_hs: spi2m0-pins {
 			rockchip,pins =
 				/* spi2_clkm0 */
@@ -2912,21 +2601,18 @@
 				<2 RK_PC3 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi2m0_cs0_hs: spi2m0-cs0 {
 			rockchip,pins =
 				/* spi2_cs0m0 */
 				<2 RK_PC4 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi2m0_cs1_hs: spi2m0-cs1 {
 			rockchip,pins =
 				/* spi2_cs1m0 */
 				<2 RK_PC5 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_pins_hs: spi2m1-pins {
 			rockchip,pins =
 				/* spi2_clkm1 */
@@ -2937,14 +2623,12 @@
 				<2 RK_PD6 3 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_cs0_hs: spi2m1-cs0 {
 			rockchip,pins =
 				/* spi2_cs0m1 */
 				<2 RK_PD5 3 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi2m1_cs1_hs: spi2m1-cs1 {
 			rockchip,pins =
 				/* spi2_cs1m1 */
@@ -2953,7 +2637,6 @@
 	};
 
 	spi3-hs {
-		/omit-if-no-ref/
 		spi3m0_pins_hs: spi3m0-pins {
 			rockchip,pins =
 				/* spi3_clkm0 */
@@ -2964,21 +2647,18 @@
 				<4 RK_PB2 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi3m0_cs0_hs: spi3m0-cs0 {
 			rockchip,pins =
 				/* spi3_cs0m0 */
 				<4 RK_PA6 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi3m0_cs1_hs: spi3m0-cs1 {
 			rockchip,pins =
 				/* spi3_cs1m0 */
 				<4 RK_PA7 4 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_pins_hs: spi3m1-pins {
 			rockchip,pins =
 				/* spi3_clkm1 */
@@ -2989,14 +2669,12 @@
 				<4 RK_PC3 2 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_cs0_hs: spi3m1-cs0 {
 			rockchip,pins =
 				/* spi3_cs0m1 */
 				<4 RK_PC6 2 &pcfg_pull_up_drv_level_1>;
 		};
 
-		/omit-if-no-ref/
 		spi3m1_cs1_hs: spi3m1-cs1 {
 			rockchip,pins =
 				/* spi3_cs1m1 */
@@ -3005,7 +2683,6 @@
 	};
 
 	gmac-txd-level3 {
-		/omit-if-no-ref/
 		gmac0_tx_bus2_level3: gmac0-tx-bus2-level3 {
 			rockchip,pins =
 				/* gmac0_txd0 */
@@ -3016,7 +2693,6 @@
 				<2 RK_PB5 1 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac0_rgmii_bus_level3: gmac0-rgmii-bus-level3 {
 			rockchip,pins =
 				/* gmac0_rxd2 */
@@ -3029,7 +2705,6 @@
 				<2 RK_PA7 2 &pcfg_pull_none_drv_level_3>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_tx_bus2_level3: gmac1m0-tx-bus2-level3 {
 			rockchip,pins =
 				/* gmac1_txd0m0 */
@@ -3040,7 +2715,6 @@
 				<3 RK_PB7 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rgmii_bus_level3: gmac1m0-rgmii-bus-level3 {
 			rockchip,pins =
 				/* gmac1_rxd2m0 */
@@ -3053,7 +2727,6 @@
 				<3 RK_PA3 3 &pcfg_pull_none_drv_level_3>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_tx_bus2_level3: gmac1m1-tx-bus2-level3 {
 			rockchip,pins =
 				/* gmac1_txd0m1 */
@@ -3064,7 +2737,6 @@
 				<4 RK_PA6 3 &pcfg_pull_none>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rgmii_bus_level3: gmac1m1-rgmii-bus-level3 {
 			rockchip,pins =
 				/* gmac1_rxd2m1 */
@@ -3079,7 +2751,6 @@
 	};
 
 	gmac-txc-level2 {
-		/omit-if-no-ref/
 		gmac0_rgmii_clk_level2: gmac0-rgmii-clk-level2 {
 			rockchip,pins =
 				/* gmac0_rxclk */
@@ -3088,7 +2759,6 @@
 				<2 RK_PB0 2 &pcfg_pull_none_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m0_rgmii_clk_level2: gmac1m0-rgmii-clk-level2 {
 			rockchip,pins =
 				/* gmac1_rxclkm0 */
@@ -3097,7 +2767,6 @@
 				<3 RK_PA6 3 &pcfg_pull_none_drv_level_2>;
 		};
 
-		/omit-if-no-ref/
 		gmac1m1_rgmii_clk_level2: gmac1m1-rgmii-clk-level2 {
 			rockchip,pins =
 				/* gmac1_rxclkm1 */
@@ -3108,7 +2777,6 @@
 	};
 
 	gpio-func {
-		/omit-if-no-ref/
 		tsadc_gpio_func: tsadc-gpio-func {
 			rockchip,pins =
 				<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
diff --git a/arch/arm64/configs/lubancat2_defconfig b/arch/arm64/configs/lubancat2_defconfig
index 2520c4d957b9..aa6641316ced 100644
--- a/arch/arm64/configs/lubancat2_defconfig
+++ b/arch/arm64/configs/lubancat2_defconfig
@@ -126,6 +126,7 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_UBI=y
+CONFIG_OF_OVERLAY=y
 CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 7301ab5e2e06..a08f9bee3e55 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -20,6 +20,9 @@ include scripts/Kbuild.include
 include $(src)/Makefile
 
 dtbinst-files	:= $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-)))
+dtboinst-files	:= $(dtbo-y)
+script-files	:= $(scr-y)
+readme-files	:= $(dtbotxt-y)
 dtbinst-dirs	:= $(subdir-y) $(subdir-m)
 
 # Helper targets for Installing DTBs into the boot directory
@@ -31,10 +34,19 @@ install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
 $(dtbinst-files): %.dtb: $(obj)/%.dtb
 	$(call cmd,dtb_install,$(install-dir))
 
+$(dtboinst-files): %.dtbo: $(obj)/%.dtbo
+	$(call cmd,dtb_install,$(install-dir))
+
+$(script-files): %.scr: $(obj)/%.scr
+	$(call cmd,dtb_install,$(install-dir))
+
+$(readme-files): %: $(src)/%
+	$(call cmd,dtb_install,$(install-dir))
+
 $(dtbinst-dirs):
 	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@
 
-PHONY += $(dtbinst-files) $(dtbinst-dirs)
-__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
+PHONY += $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
+__dtbs_install: $(dtbinst-files) $(dtboinst-files) $(script-files) $(readme-files) $(dtbinst-dirs)
 
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 34c0f3f8c5f7..a5ae0dd416ec 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -61,6 +61,9 @@ real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))
 extra-y				+= $(dtb-y)
 extra-$(CONFIG_OF_ALL_DTBS)	+= $(dtb-)
 
+# Overlay targets
+extra-y		+= $(dtbo-y) $(scr-y) $(dtbotxt-y)
+
 # Add subdir path
 
 extra-y		:= $(addprefix $(obj)/,$(extra-y))
@@ -277,6 +280,9 @@ endif
 
 DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
 
+# Overlay support
+DTC_FLAGS += -@ -Wno-unit_address_format -Wno-simple_bus_reg
+
 # Generate an assembly file to wrap the output of the device tree compiler
 quiet_cmd_dt_S_dtb= DTB     $@
 cmd_dt_S_dtb=						\
@@ -306,6 +312,23 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
 $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
 	$(call if_changed_dep,dtc)
 
+quiet_cmd_dtco = DTCO    $@
+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
+	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+	$(DTC) -@ -O dtb -o $@ -b 0 \
+		-i $(dir $<) $(DTC_FLAGS) \
+		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
+	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
+
+$(obj)/%.dtbo: $(src)/%.dts FORCE
+	$(call if_changed_dep,dtco)
+
+quiet_cmd_scr = MKIMAGE $@
+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
+
+$(obj)/%.scr: $(src)/%.scr-cmd FORCE
+	$(call if_changed,scr)
+
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 
 # Bzip2