diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index ec7a963cb5a0..87d261d2a18c 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -882,6 +882,27 @@
 			drive-strength = <2>;
 		};
 	};
+
+	pwmab_to_gpios: pwmab_gpio {
+		mux {
+			groups = "GPIOX_6", "GPIOX_19";
+			function = "gpio_periphs";
+		};
+	};
+
+	pwmcd_to_gpios: pwmcd_gpio {
+		mux {
+			groups = "GPIOX_5", "GPIOX_3";
+			function = "gpio_periphs";
+		};
+	};
+
+	pwmef_to_gpios: pwmef_gpio {
+		mux {
+			groups = "GPIOX_16", "GPIOX_7";
+			function = "gpio_periphs";
+		};
+	};
 };
 
 &pinctrl_aobus {
diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
index a6187dd62f43..95a2852477f3 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
@@ -590,4 +590,18 @@
 			function = "gpio_periphs";
 		};
 	};
+
+	pwmcd_to_gpios: pwmcd_gpio {
+		mux {
+			groups = "GPIOX_5", "GPIOX_6";
+			function = "gpio_periphs";
+		};
+	};
+
+	pwmef_to_gpios: pwmef_gpio {
+		mux {
+			groups = "GPIOX_16", "GPIOX_7";
+			function = "gpio_periphs";
+		};
+	};
 }; /* end of pinctrl_periphs */
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_a-pwmfan.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_a-pwmfan.dts
index e9acda3e2379..c44c9575d37c 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_a-pwmfan.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_a-pwmfan.dts
@@ -13,8 +13,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
+			pinctrl-1 = <&pwmab_to_gpios>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts
index 9176e482565f..f7463a38a37b 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ab.dts
@@ -9,8 +9,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
+			pinctrl-1 = <&pwmab_to_gpios>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_b-backlight.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_b-backlight.dts
index ee1c1f9239df..b537836db418 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_b-backlight.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_b-backlight.dts
@@ -12,8 +12,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_a_pins &pwm_b_pins2>;
+			pinctrl-1 = <&pwmab_to_gpios>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts
index fa3c042f1d61..037f94833fd6 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_cd.dts
@@ -9,8 +9,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins1>;
+			pinctrl-1 = <&pwmcd_to_gpios>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts
index ad25c9ea8619..a7450e65ba6e 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/pwm_ef.dts
@@ -9,8 +9,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
+			pinctrl-1 = <&pwmef_to_gpios>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_c-pwmfan.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_c-pwmfan.dts
index 14c0b4564c00..aba349109f34 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_c-pwmfan.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_c-pwmfan.dts
@@ -13,8 +13,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
+			pinctrl-1 = <&pwmcd_to_gpios>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts
index 6f2ca0a2767f..546d21604bd4 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_cd.dts
@@ -9,8 +9,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
+			pinctrl-1 = <&pwmcd_to_gpios>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_d-backlight.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_d-backlight.dts
index 81c5ec15956b..fdf2bc342726 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_d-backlight.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_d-backlight.dts
@@ -12,8 +12,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_c_pins2 &pwm_d_pins2>;
+			pinctrl-1 = <&pwmcd_to_gpios>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts
index ad25c9ea8619..a7450e65ba6e 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/pwm_ef.dts
@@ -9,8 +9,9 @@
 
 		__overlay__ {
 			status = "okay";
-			pinctrl-names = "pwm_pins";
+			pinctrl-names = "pwm_pins", "gpio_periphs";
 			pinctrl-0 = <&pwm_e_pins &pwm_f_pins1>;
+			pinctrl-1 = <&pwmef_to_gpios>;
 		};
 	};
 };