diff --git a/qcom/yupik-atp.dtsi b/qcom/yupik-atp.dtsi
index 45631c00e0c6..cbac0b4584c9 100644
--- a/qcom/yupik-atp.dtsi
+++ b/qcom/yupik-atp.dtsi
@@ -70,20 +70,26 @@
 	vcc-low-voltage-sup;
 	vcc-max-microamp = <800000>;
 
+	/*
+	 * Yupik target supports both UFS2.2 & UFS3.1, here
+	 * vccq2 is supplied via eLDO, and that is controlled via
+	 * L9B which supports a max voltage of 1.2V, but eLDO would
+	 * supply 1.8V. and same L9B acts as vccq voltage for UFS3.1
+	 * devices.
+	 * Here L9B can max support for 1.2V but UFS GKI driver code
+	 * votes for 1.8V, which is leading to failure from pmic
+	 * regulator.
+	 *
+	 * Now since vccq and control of eLDO are common that is L9B
+	 * we can use vccq vote as control of eLDO for vccq2.
+	 * Hence vccq entries shall be used for both type of UFS
+	 * devices only. And vccq entries should not be changed/removed
+	 * for any design alteration.
+	 */
 	vccq-supply = <&L9B>;
 	vccq-max-microamp = <900000>;
 	vccq-min-microamp = <10000>;
 
-	/*
-	 * Vccq2 voltage level should be 1.8V but in case of yupik
-	 * vccq2 is supplied via eLDO, and that is controlled via
-	 * L9B which supports a max voltage of 1.2V, but eLDO would
-	 * supply 1.8V.
-	 */
-	vccq2-supply = <&L9B>;
-	vccq2-voltage-level = <1200000 1200000>;
-	vccq2-max-microamp = <800000>;
-
 	qcom,vddp-ref-clk-supply = <&L9B>;
 	qcom,vddp-ref-clk-max-microamp = <100>;
 
diff --git a/qcom/yupik-idp.dtsi b/qcom/yupik-idp.dtsi
index 291879aeb65d..7b366fdab1b2 100644
--- a/qcom/yupik-idp.dtsi
+++ b/qcom/yupik-idp.dtsi
@@ -71,20 +71,26 @@
 	vcc-low-voltage-sup;
 	vcc-max-microamp = <800000>;
 
+	/*
+	 * Yupik target supports both UFS2.2 & UFS3.1, here
+	 * vccq2 is supplied via eLDO, and that is controlled via
+	 * L9B which supports a max voltage of 1.2V, but eLDO would
+	 * supply 1.8V. and same L9B acts as vccq voltage for UFS3.1
+	 * devices.
+	 * Here L9B can max support for 1.2V but UFS GKI driver code
+	 * votes for 1.8V, which is leading to failure from pmic
+	 * regulator.
+	 *
+	 * Now since vccq and control of eLDO are common that is L9B
+	 * we can use vccq vote as control of eLDO for vccq2.
+	 * Hence vccq entries shall be used for both type of UFS
+	 * devices only. And vccq entries should not be changed/removed
+	 * for any design alteration.
+	 */
 	vccq-supply = <&L9B>;
 	vccq-max-microamp = <900000>;
 	vccq-min-microamp = <10000>;
 
-	/*
-	 * Vccq2 voltage level should be 1.8V but in case of yupik
-	 * vccq2 is supplied via eLDO, and that is controlled via
-	 * L9B which supports a max voltage of 1.2V, but eLDO would
-	 * supply 1.8V.
-	 */
-	vccq2-supply = <&L9B>;
-	vccq2-voltage-level = <1200000 1200000>;
-	vccq2-max-microamp = <800000>;
-
 	qcom,vddp-ref-clk-supply = <&L9B>;
 	qcom,vddp-ref-clk-max-microamp = <100>;
 
diff --git a/qcom/yupik-qrd.dtsi b/qcom/yupik-qrd.dtsi
index 4d6aedc0a0ca..d95343329818 100644
--- a/qcom/yupik-qrd.dtsi
+++ b/qcom/yupik-qrd.dtsi
@@ -72,20 +72,26 @@
 	vcc-low-voltage-sup;
 	vcc-max-microamp = <800000>;
 
+	/*
+	 * Yupik target supports both UFS2.2 & UFS3.1, here
+	 * vccq2 is supplied via eLDO, and that is controlled via
+	 * L9B which supports a max voltage of 1.2V, but eLDO would
+	 * supply 1.8V. and same L9B acts as vccq voltage for UFS3.1
+	 * devices.
+	 * Here L9B can max support for 1.2V but UFS GKI driver code
+	 * votes for 1.8V, which is leading to failure from pmic
+	 * regulator.
+	 *
+	 * Now since vccq and control of eLDO are common that is L9B
+	 * we can use vccq vote as control of eLDO for vccq2.
+	 * Hence vccq entries shall be used for both type of UFS
+	 * devices only. And vccq entries should not be changed/removed
+	 * for any design alteration.
+	 */
 	vccq-supply = <&L9B>;
 	vccq-max-microamp = <900000>;
 	vccq-min-microamp = <10000>;
 
-	/*
-	 * Vccq2 voltage level should be 1.8V but in case of yupik
-	 * vccq2 is supplied via eLDO, and that is controlled via
-	 * L9B which supports a max voltage of 1.2V, but eLDO would
-	 * supply 1.8V.
-	 */
-	vccq2-supply = <&L9B>;
-	vccq2-voltage-level = <1200000 1200000>;
-	vccq2-max-microamp = <800000>;
-
 	qcom,vddp-ref-clk-supply = <&L9B>;
 	qcom,vddp-ref-clk-max-microamp = <100>;