diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
index 96b54e74612c3..0289b2b1e8d1d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -289,7 +289,7 @@
 };
 
 &dwc3 {
-	ports {
+	port {
 		usb_dwc2_out: endpoint@0 {
 			remote-endpoint = <&ucsi0_hs_in>;
 		};
@@ -423,7 +423,8 @@
 	bus-width = <4>;
 	cap-sd-highspeed;
 	sd-uhs-sdr50;
-	max-frequency = <100000000>;
+	sd-uhs-sdr104;
+	max-frequency = <200000000>;
 
 	non-removable;
 	disable-wp;
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
index f6c1891511e22..b79210aaafc4f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
@@ -322,7 +322,7 @@
 &cpu_thermal {
 	trips {
 		cpu_active: cpu-active {
-			temperature = <70000>; /* millicelsius */
+			temperature = <60000>; /* millicelsius */
 			hysteresis = <2000>; /* millicelsius */
 			type = "active";
 		};
@@ -352,7 +352,7 @@
 	gpio-line-names =
 		/* GPIOZ */
 		"PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40",
-		"", "", "", "", "", "", "", "",
+		"PIN_16", "PIN_22", "", "", "", "", "", "",
 		/* GPIOH */
 		"", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23",
 		"",
@@ -360,10 +360,10 @@
 		"", "", "", "", "", "", "", "",
 		"", "", "", "", "EMMC_PWRSEQ", "", "", "",
 		/* GPIOC */
-		"", "", "", "", "", "", "SD_CD", "PIN_36",
+		"", "", "", "", "", "", "SD_CD", "",
 		/* GPIOA */
-		"PIN_32", "PIN_12", "PIN_35", "", "", "PIN_38", "", "",
-		"", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5",
+		"PIN_32", "PIN_12", "PIN_35", "PIN_36", "PIN_31", "PIN_38", "", "",
+		"", "", "", "", "LED_GREEN", "", "PIN_3", "PIN_5",
 		/* GPIOX */
 		"", "", "", "", "", "", "SDIO_PWRSEQ", "",
 		"", "", "", "", "", "", "", "",
@@ -392,17 +392,13 @@
 	};
 };
 
-&dwc2 {
+&dwc3 {
 	port {
-		usb_dwc2_out: endpoint {
+		usb_dwc2_out: endpoint@0 {
 			remote-endpoint = <&ucsi0_hs_in>;
 		};
-	};
-};
 
-&dwc3 {
-	port {
-		usb_dwc3_out: endpoint {
+		usb_dwc3_out: endpoint@1 {
 			remote-endpoint = <&ucsi0_ss_in>;
 		};
 	};
@@ -519,7 +515,8 @@
 
 	bus-width = <4>;
 	cap-sd-highspeed;
-	max-frequency = <100000000>;
+	sd-uhs-sdr104;
+	max-frequency = <200000000>;
 
 	non-removable;
 	disable-wp;
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
index 28e426f1f0ed0..b3e15ced31e6a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
@@ -197,3 +197,45 @@
 &npu {
 	power-domains = <&pwrc PWRC_G12A_NNA_ID>;
 };
+
+&periphs_pinctrl {
+	pwm_b_h_pins: pwm-b-h {
+		mux {
+			groups = "pwm_b_h";
+			function = "pwm_b";
+			bias-disable;
+		};
+	};
+
+	pwm_b_z_pins: pwm-b-z {
+		mux {
+			groups = "pwm_b_z";
+			function = "pwm_b";
+			bias-disable;
+		};
+	};
+
+	pwm_c_z_pins: pwm-c-z {
+		mux {
+			groups = "pwm_c_z";
+			function = "pwm_c";
+			bias-disable;
+		};
+	};
+
+	pwm_d_a_pins: pwm-d-a {
+		mux {
+			groups = "pwm_d_a";
+			function = "pwm_d";
+			bias-disable;
+		};
+	};
+
+	pwm_d_z_pins: pwm-d-z {
+		mux {
+			groups = "pwm_d_z";
+			function = "pwm_d";
+			bias-disable;
+		};
+	};
+};
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 117e72b4ffcb7..ddab2f66933d2 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -664,7 +664,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(pwm_c_x8,			5),
 	GROUP(pwm_c_c,			5),
 	GROUP(pwm_c_z,			5),
-	GROUP(pwm_d_z,			4),
+	GROUP(pwm_d_z,			2),
 	GROUP(pwm_d_a,			3),
 	GROUP(pwm_d_x3,			4),
 	GROUP(pwm_d_x6,			4),