diff --git a/qcom/yupik-qrd.dtsi b/qcom/yupik-qrd.dtsi
index c9db2290ae63..55329158acf7 100644
--- a/qcom/yupik-qrd.dtsi
+++ b/qcom/yupik-qrd.dtsi
@@ -265,6 +265,94 @@
 		};
 	};
 
+	modem-sub6-pa1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_PA)>;
+		trips {
+			sub6_pa1_trip0: sub6-pa1-trip0 {
+				temperature = <43000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
+			sub6_pa1_trip1: sub6-pa1-trip1 {
+				temperature = <45000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
+			sub6_pa1_trip2: sub6-pa1-trip2 {
+				temperature = <55000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			pa_fr1_cdev0 {
+				trip = <&sub6_pa1_trip0>;
+				cooling-device = <&modem_pa_fr1 1 1>;
+			};
+
+			pa_fr1_cdev1 {
+				trip = <&sub6_pa1_trip1>;
+				cooling-device = <&modem_pa_fr1 2 2>;
+			};
+
+			pa_fr1_cdev2 {
+				trip = <&sub6_pa1_trip2>;
+				cooling-device = <&modem_pa_fr1 3 3>;
+			};
+		};
+	};
+
+	modem-lte-pa2-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_PA_1)>;
+		trips {
+			sub6_pa2_trip0: sub6-pa2-trip0 {
+				temperature = <42000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
+			sub6_pa2_trip1: sub6-pa2-trip1 {
+				temperature = <44000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
+			sub6_pa2_trip2: sub6-pa2-trip2 {
+				temperature = <55000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			pa_cdev0 {
+				trip = <&sub6_pa2_trip0>;
+				cooling-device = <&modem_pa 1 1>;
+			};
+
+			pa_cdev1 {
+				trip = <&sub6_pa2_trip1>;
+				cooling-device = <&modem_pa 2 2>;
+			};
+
+			pa_cdev2 {
+				trip = <&sub6_pa2_trip2>;
+				cooling-device = <&modem_pa 3 3>;
+			};
+		};
+	};
+
 	quiet-therm-step {
 		polling-delay-passive = <2000>;
 		polling-delay = <0>;
diff --git a/qcom/yupik-thermal.dtsi b/qcom/yupik-thermal.dtsi
index 93a742f62c48..a9d549cfe7b1 100644
--- a/qcom/yupik-thermal.dtsi
+++ b/qcom/yupik-thermal.dtsi
@@ -263,94 +263,6 @@
 		};
 	};
 
-	modem-sub6-pa1-step {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "step_wise";
-		thermal-sensors = <&qmi_sensor
-				(QMI_MODEM_INST_ID+QMI_PA)>;
-		trips {
-			sub6_pa1_trip0: sub6-pa1-trip0 {
-				temperature = <43000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
-			sub6_pa1_trip1: sub6-pa1-trip1 {
-				temperature = <45000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
-			sub6_pa1_trip2: sub6-pa1-trip2 {
-				temperature = <55000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			pa_fr1_cdev0 {
-				trip = <&sub6_pa1_trip0>;
-				cooling-device = <&modem_pa_fr1 1 1>;
-			};
-
-			pa_fr1_cdev1 {
-				trip = <&sub6_pa1_trip1>;
-				cooling-device = <&modem_pa_fr1 2 2>;
-			};
-
-			pa_fr1_cdev2 {
-				trip = <&sub6_pa1_trip2>;
-				cooling-device = <&modem_pa_fr1 3 3>;
-			};
-		};
-	};
-
-	modem-lte-pa2-step {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "step_wise";
-		thermal-sensors = <&qmi_sensor
-				(QMI_MODEM_INST_ID+QMI_PA_1)>;
-		trips {
-			sub6_pa2_trip0: sub6-pa2-trip0 {
-				temperature = <42000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
-			sub6_pa2_trip1: sub6-pa2-trip1 {
-				temperature = <44000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
-			sub6_pa2_trip2: sub6-pa2-trip2 {
-				temperature = <55000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			pa_cdev0 {
-				trip = <&sub6_pa2_trip0>;
-				cooling-device = <&modem_pa 1 1>;
-			};
-
-			pa_cdev1 {
-				trip = <&sub6_pa2_trip1>;
-				cooling-device = <&modem_pa 2 2>;
-			};
-
-			pa_cdev2 {
-				trip = <&sub6_pa2_trip2>;
-				cooling-device = <&modem_pa 3 3>;
-			};
-		};
-	};
-
 	cpu-0-0-step {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;