diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
index b2a6c8fd51bf..88e97d2bec75 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
@@ -538,6 +538,13 @@
 };
 
 &pinctrl_periphs {
+	a_uart_two_pins: a_uart_two {
+		mux {
+			groups = "uart_tx_a",
+				"uart_rx_a";
+			function = "uart_a";
+		};
+	};
 	tdmb_mclk: tdmb_mclk {
 		mux {
 			groups = "mclk0_a";
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/display_vu7c.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/display_vu7c.dts
index 663e66d2bfc5..7cd8b4764086 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/display_vu7c.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/display_vu7c.dts
@@ -128,7 +128,6 @@
 			status = "okay";
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c3_master_pins2>;
-			pinctrl-1 = <&i2c3_to_gpioa>;
 			clock-frequency = <400000>; /* default 400k */
 
 			touch: gt9xx@14 {
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/uart0.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/uart0.dts
index abcaeb99f81c..dd60112f0076 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/uart0.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/uart0.dts
@@ -7,17 +7,7 @@
 
 		__overlay__ {
 			status = "okay";
-		};
-	};
-
-	fragment@1 {
-		target = <&a_uart_pins>;
-
-		__overlay__ {
-			mux {
-				groups = "uart_tx_a",
-					   "uart_rx_a";
-			};
+			pinctrl-0 = <&a_uart_two_pins>;
 		};
 	};
 };