diff --git a/patch/kernel/sunxi-current/general-sunxi-overlays.patch b/patch/kernel/sunxi-current/general-sunxi-overlays.patch
index 84a0c2619..934587d45 100644
--- a/patch/kernel/sunxi-current/general-sunxi-overlays.patch
+++ b/patch/kernel/sunxi-current/general-sunxi-overlays.patch
@@ -2846,28 +2846,28 @@ index 0000000..db3cec8
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart2@0 phandle
++	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart2-pi-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle}>"
 +	env delete tmp_phandle
 +fi
 +
 +if test "${param_uart3_pins}" = "b"; then
 +	if test "${param_uart3_rtscts}" = "1"; then
-+		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3_pins_b phandle
-+		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_pins_b_rts_cts phandle
++		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-ph-pins phandle
++		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-cts-rts-ph-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +		fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
 +		env delete tmp_phandle1 tmp_phandle2
 +	else
-+		fdt get value tmp_phandle /soc/pinctrl@1c20800/uart3_pins_b phandle
++		fdt get value tmp_phandle /soc/pinctrl@1c20800/uart3-ph-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle}>"
 +		env delete tmp_phandle
 +	fi
 +else
 +	if test "${param_uart3_rtscts}" = "1"; then
-+		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3_pins_a_2 phandle
-+		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_pins_a_rts_cts phandle
++		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pg-pins phandle
++		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-cts-rts-pg-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +		fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -2876,7 +2876,7 @@ index 0000000..db3cec8
 +fi
 +
 +if test "${param_uart4_pins}" = "b"; then
-+	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart4@1 phandle
++	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart4-pg-pins phandle
 +	fdt set /soc/serial@1c29000 pinctrl-0 "<${tmp_phandle}>"
 +	env delete tmp_phandle
 +fi
@@ -3899,8 +3899,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -3908,8 +3908,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -3917,8 +3917,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -5128,8 +5128,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts_pins phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -5137,8 +5137,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts_pins phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -5146,8 +5146,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart4_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart4 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart4_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart4-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart4-rts-cts-pins phandle
 +	fdt set /soc/serial@1c29000 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c29000 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c29000 pinctrl-1 "<${tmp_phandle2}>"
@@ -5439,12 +5439,12 @@ index 0000000..36475fd
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_pins: uart2_pins {
++			uart2_pins: uart2-pins {
 +				pins = "PB0", "PB1";
 +				function = "uart2";
 +			};
 +
-+			uart2_rts_cts_pins: uart2_rts_cts_pins {
++			uart2_rts_cts_pins: uart2-rts-cts-pins {
 +				pins = "PB2", "PB3";
 +				function = "uart2";
 +			};
@@ -5482,7 +5482,7 @@ index 0000000..a103a75
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_pins: uart3_pins {
++			uart3_pins: uart3-pins {
 +				pins = "PD0", "PD1";
 +				function = "uart3";
 +			};
@@ -5520,12 +5520,12 @@ index 0000000..6e4702b
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart4_pins: uart4_pins {
++			uart4_pins: uart4-pins {
 +				pins = "PD2", "PD3";
 +				function = "uart4";
 +			};
 +
-+			uart4_rts_cts_pins: uart4_rts_cts_pins {
++			uart4_rts_cts_pins: uart4-rts-cts-pins {
 +				pins = "PD4", "PD5";
 +				function = "uart4";
 +			};
@@ -5711,8 +5711,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -5720,8 +5720,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -5729,8 +5729,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -6131,7 +6131,7 @@ index 0000000..521a01d
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_rts_cts: uart2_rts_cts {
++			uart2_rts_cts: uart2-rts-cts-pins {
 +				pins = "PA2", "PA3";
 +				function = "uart2";
 +			};
@@ -6169,7 +6169,7 @@ index 0000000..639e15d
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_rts_cts: uart3_rts_cts {
++			uart3_rts_cts: uart3-rts-cts-pins {
 +				pins = "PA15", "PA16";
 +				function = "uart3";
 +			};
@@ -6443,8 +6443,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@5000400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000400 pinctrl-1 "<${tmp_phandle2}>"
@@ -6452,8 +6452,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@5000800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000800 pinctrl-1 "<${tmp_phandle2}>"
@@ -6461,8 +6461,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@5000c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -6794,7 +6794,7 @@ index 0000000..7a1860e
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_rts_cts: uart2_rts_cts {
++			uart2_rts_cts: uart2-rts-cts-pins {
 +				pins = "PD21", "PD22";
 +				function = "uart2";
 +			};
@@ -6832,7 +6832,7 @@ index 0000000..770219a
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_rts_cts: uart3_rts_cts {
++			uart3_rts_cts: uart3-rts-cts-pins {
 +				pins = "PD25", "PD26";
 +				function = "uart3";
 +			};
diff --git a/patch/kernel/sunxi-dev/general-sunxi-overlays.patch b/patch/kernel/sunxi-dev/general-sunxi-overlays.patch
index bca6eb12d..2b15fc211 100644
--- a/patch/kernel/sunxi-dev/general-sunxi-overlays.patch
+++ b/patch/kernel/sunxi-dev/general-sunxi-overlays.patch
@@ -2854,28 +2854,28 @@ index 0000000..db3cec8
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart2@0 phandle
++	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart2-pi-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle}>"
 +	env delete tmp_phandle
 +fi
 +
 +if test "${param_uart3_pins}" = "b"; then
 +	if test "${param_uart3_rtscts}" = "1"; then
-+		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3_pins_b phandle
-+		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_pins_b_rts_cts phandle
++		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-ph-pins phandle
++		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-cts-rts-ph-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +		fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
 +		env delete tmp_phandle1 tmp_phandle2
 +	else
-+		fdt get value tmp_phandle /soc/pinctrl@1c20800/uart3_pins_b phandle
++		fdt get value tmp_phandle /soc/pinctrl@1c20800/uart3-ph-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle}>"
 +		env delete tmp_phandle
 +	fi
 +else
 +	if test "${param_uart3_rtscts}" = "1"; then
-+		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3_pins_a_2 phandle
-+		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_pins_a_rts_cts phandle
++		fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pg-pins phandle
++		fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-cts-rts-pg-pins phandle
 +		fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +		fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +		fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -2884,7 +2884,7 @@ index 0000000..db3cec8
 +fi
 +
 +if test "${param_uart4_pins}" = "b"; then
-+	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart4@1 phandle
++	fdt get value tmp_phandle /soc/pinctrl@1c20800/uart4-pg-pins phandle
 +	fdt set /soc/serial@1c29000 pinctrl-0 "<${tmp_phandle}>"
 +	env delete tmp_phandle
 +fi
@@ -3907,8 +3907,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -3916,8 +3916,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -3925,8 +3925,8 @@ index 0000000..142b7e5
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -5366,8 +5366,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts_pins phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -5375,8 +5375,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts_pins phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -5384,8 +5384,8 @@ index 0000000..36df83c
 +fi
 +
 +if test "${param_uart4_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart4 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart4_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart4-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart4-rts-cts-pins phandle
 +	fdt set /soc/serial@1c29000 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c29000 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c29000 pinctrl-1 "<${tmp_phandle2}>"
@@ -5677,12 +5677,12 @@ index 0000000..36475fd
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_pins: uart2_pins {
++			uart2_pins: uart2-pins {
 +				pins = "PB0", "PB1";
 +				function = "uart2";
 +			};
 +
-+			uart2_rts_cts_pins: uart2_rts_cts_pins {
++			uart2_rts_cts_pins: uart2-rts-cts-pins {
 +				pins = "PB2", "PB3";
 +				function = "uart2";
 +			};
@@ -5720,7 +5720,7 @@ index 0000000..a103a75
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_pins: uart3_pins {
++			uart3_pins: uart3-pins {
 +				pins = "PD0", "PD1";
 +				function = "uart3";
 +			};
@@ -5758,12 +5758,12 @@ index 0000000..6e4702b
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart4_pins: uart4_pins {
++			uart4_pins: uart4-pins {
 +				pins = "PD2", "PD3";
 +				function = "uart4";
 +			};
 +
-+			uart4_rts_cts_pins: uart4_rts_cts_pins {
++			uart4_rts_cts_pins: uart4-rts-cts-pins {
 +				pins = "PD4", "PD5";
 +				function = "uart4";
 +			};
@@ -5949,8 +5949,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28400 pinctrl-1 "<${tmp_phandle2}>"
@@ -5958,8 +5958,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28800 pinctrl-1 "<${tmp_phandle2}>"
@@ -5967,8 +5967,8 @@ index 0000000..f7b89ae
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@1c20800/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@1c20800/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@1c28c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@1c28c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@1c28c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -6369,7 +6369,7 @@ index 0000000..521a01d
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_rts_cts: uart2_rts_cts {
++			uart2_rts_cts: uart2-rts-cts-pins {
 +				pins = "PA2", "PA3";
 +				function = "uart2";
 +			};
@@ -6407,7 +6407,7 @@ index 0000000..639e15d
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_rts_cts: uart3_rts_cts {
++			uart3_rts_cts: uart3-rts-cts-pins {
 +				pins = "PA15", "PA16";
 +				function = "uart3";
 +			};
@@ -6681,8 +6681,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart1_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart1 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart1_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart1-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart1-rts-cts-pins phandle
 +	fdt set /soc/serial@5000400 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000400 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000400 pinctrl-1 "<${tmp_phandle2}>"
@@ -6690,8 +6690,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart2_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart2 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart2_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart2-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart2-rts-cts-pins phandle
 +	fdt set /soc/serial@5000800 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000800 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000800 pinctrl-1 "<${tmp_phandle2}>"
@@ -6699,8 +6699,8 @@ index 0000000..5f00458
 +fi
 +
 +if test "${param_uart3_rtscts}" = "1"; then
-+	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart3 phandle
-+	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart3_rts_cts phandle
++	fdt get value tmp_phandle1 /soc/pinctrl@300b000/uart3-pins phandle
++	fdt get value tmp_phandle2 /soc/pinctrl@300b000/uart3-rts-cts-pins phandle
 +	fdt set /soc/serial@5000c00 pinctrl-names "default" "default"
 +	fdt set /soc/serial@5000c00 pinctrl-0 "<${tmp_phandle1}>"
 +	fdt set /soc/serial@5000c00 pinctrl-1 "<${tmp_phandle2}>"
@@ -7032,7 +7032,7 @@ index 0000000..7a1860e
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart2_rts_cts: uart2_rts_cts {
++			uart2_rts_cts: uart2-rts-cts-pins {
 +				pins = "PD21", "PD22";
 +				function = "uart2";
 +			};
@@ -7070,7 +7070,7 @@ index 0000000..770219a
 +	fragment@1 {
 +		target = <&pio>;
 +		__overlay__ {
-+			uart3_rts_cts: uart3_rts_cts {
++			uart3_rts_cts: uart3-rts-cts-pins {
 +				pins = "PD25", "PD26";
 +				function = "uart3";
 +			};