diff --git a/gpu/sun-v2-gpu-pwrlevels.dtsi b/gpu/sun-v2-gpu-pwrlevels.dtsi
index df211154..cd161ec7 100644
--- a/gpu/sun-v2-gpu-pwrlevels.dtsi
+++ b/gpu/sun-v2-gpu-pwrlevels.dtsi
@@ -25,16 +25,12 @@
 
 		compatible = "qcom,gpu-pwrlevels-bins";
 
-		/*
-		 * The bins need to match based on speed bin first and then SKU.
-		 * Keep pwrlevel bins sorted in ascending order of the fmax of the bins.
-		 */
 		qcom,gpu-pwrlevels-0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			qcom,initial-pwrlevel = <10>;
-			qcom,speed-bin = <0xbe>;
+			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_AB)>;
 
 			/* NOM */
 			qcom,gpu-pwrlevel@0 {
@@ -179,7 +175,7 @@
 			#size-cells = <0>;
 
 			qcom,initial-pwrlevel = <12>;
-			qcom,speed-bin = <0xdd>;
+			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_AC)>;
 
 			/* TURBO_L1 */
 			qcom,gpu-pwrlevel@0 {
@@ -349,545 +345,6 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			qcom,initial-pwrlevel = <12>;
-			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_AB)>;
-
-			/* TURBO_L1 */
-			qcom,gpu-pwrlevel@0 {
-				reg = <0>;
-				qcom,gpu-freq = <1050000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L1>;
-			};
-
-			/* NOM_L1 */
-			qcom,gpu-pwrlevel@1 {
-				reg = <1>;
-				qcom,gpu-freq = <967000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM_L1>;
-			};
-
-			/* NOM */
-			qcom,gpu-pwrlevel@2 {
-				reg = <2>;
-				qcom,gpu-freq = <900000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM>;
-			};
-
-			/* SVS_L2 */
-			qcom,gpu-pwrlevel@3 {
-				reg = <3>;
-				qcom,gpu-freq = <832000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L2>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L2>;
-			};
-
-			/* SVS_L1 */
-			qcom,gpu-pwrlevel@4 {
-				reg = <4>;
-				qcom,gpu-freq = <734000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-
-				qcom,bus-freq = <8>;
-				qcom,bus-min = <6>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L1>;
-			};
-
-			/* SVS_L0 */
-			qcom,gpu-pwrlevel@5 {
-				reg = <5>;
-				qcom,gpu-freq = <660000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L0>;
-			};
-
-			/* SVS */
-			qcom,gpu-pwrlevel@6 {
-				reg = <6>;
-				qcom,gpu-freq = <607000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS>;
-			};
-
-			/* Low_SVS_L1 */
-			qcom,gpu-pwrlevel@7 {
-				reg = <7>;
-				qcom,gpu-freq = <525000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_L1>;
-			};
-
-			/* Low_SVS */
-			qcom,gpu-pwrlevel@8 {
-				reg = <8>;
-				qcom,gpu-freq = <443000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS>;
-			};
-
-			/* Low_SVS_D0 */
-			qcom,gpu-pwrlevel@9 {
-				reg = <9>;
-				qcom,gpu-freq = <389000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D0>;
-			};
-
-			/* Low_SVS_D1 */
-			qcom,gpu-pwrlevel@10 {
-				reg = <10>;
-				qcom,gpu-freq = <342000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D2 */
-			qcom,gpu-pwrlevel@11 {
-				reg = <11>;
-				qcom,gpu-freq = <222000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D3 */
-			qcom,gpu-pwrlevel@12 {
-				reg = <12>;
-				qcom,gpu-freq = <160000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D3>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-		};
-
-		qcom,gpu-pwrlevels-3 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			qcom,initial-pwrlevel = <13>;
-			qcom,speed-bin = <0xf2>;
-
-			/* TURBO_L3 */
-			qcom,gpu-pwrlevel@0 {
-				reg = <0>;
-				qcom,gpu-freq = <1150000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L3>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L3>;
-			};
-
-			/* TURBO_L1 */
-			qcom,gpu-pwrlevel@1 {
-				reg = <1>;
-				qcom,gpu-freq = <1050000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L1>;
-			};
-
-			/* NOM_L1 */
-			qcom,gpu-pwrlevel@2 {
-				reg = <2>;
-				qcom,gpu-freq = <967000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM_L1>;
-			};
-
-			/* NOM */
-			qcom,gpu-pwrlevel@3 {
-				reg = <3>;
-				qcom,gpu-freq = <900000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM>;
-			};
-
-			/* SVS_L2 */
-			qcom,gpu-pwrlevel@4 {
-				reg = <4>;
-				qcom,gpu-freq = <832000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L2>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L2>;
-			};
-
-			/* SVS_L1 */
-			qcom,gpu-pwrlevel@5 {
-				reg = <5>;
-				qcom,gpu-freq = <734000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-
-				qcom,bus-freq = <8>;
-				qcom,bus-min = <6>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L1>;
-			};
-
-			/* SVS_L0 */
-			qcom,gpu-pwrlevel@6 {
-				reg = <6>;
-				qcom,gpu-freq = <660000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L0>;
-			};
-
-			/* SVS */
-			qcom,gpu-pwrlevel@7 {
-				reg = <7>;
-				qcom,gpu-freq = <607000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS>;
-			};
-
-			/* Low_SVS_L1 */
-			qcom,gpu-pwrlevel@8 {
-				reg = <8>;
-				qcom,gpu-freq = <525000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_L1>;
-			};
-
-			/* Low_SVS */
-			qcom,gpu-pwrlevel@9 {
-				reg = <9>;
-				qcom,gpu-freq = <443000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS>;
-			};
-
-			/* Low_SVS_D0 */
-			qcom,gpu-pwrlevel@10 {
-				reg = <10>;
-				qcom,gpu-freq = <389000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D0>;
-			};
-
-			/* Low_SVS_D1 */
-			qcom,gpu-pwrlevel@11 {
-				reg = <11>;
-				qcom,gpu-freq = <342000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D2 */
-			qcom,gpu-pwrlevel@12 {
-				reg = <12>;
-				qcom,gpu-freq = <222000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D3 */
-			qcom,gpu-pwrlevel@13 {
-				reg = <13>;
-				qcom,gpu-freq = <160000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D3>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-		};
-
-		qcom,gpu-pwrlevels-4 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			qcom,initial-pwrlevel = <13>;
-			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_AC)>;
-
-			/* TURBO_L3 */
-			qcom,gpu-pwrlevel@0 {
-				reg = <0>;
-				qcom,gpu-freq = <1150000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L3>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L3>;
-			};
-
-			/* TURBO_L1 */
-			qcom,gpu-pwrlevel@1 {
-				reg = <1>;
-				qcom,gpu-freq = <1050000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_TURBO_L1>;
-			};
-
-			/* NOM_L1 */
-			qcom,gpu-pwrlevel@2 {
-				reg = <2>;
-				qcom,gpu-freq = <967000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
-
-				qcom,bus-freq = <11>;
-				qcom,bus-min = <11>;
-				qcom,bus-max = <11>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM_L1>;
-			};
-
-			/* NOM */
-			qcom,gpu-pwrlevel@3 {
-				reg = <3>;
-				qcom,gpu-freq = <900000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_NOM>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_NOM>;
-			};
-
-			/* SVS_L2 */
-			qcom,gpu-pwrlevel@4 {
-				reg = <4>;
-				qcom,gpu-freq = <832000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L2>;
-
-				qcom,bus-freq = <10>;
-				qcom,bus-min = <7>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L2>;
-			};
-
-			/* SVS_L1 */
-			qcom,gpu-pwrlevel@5 {
-				reg = <5>;
-				qcom,gpu-freq = <734000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-
-				qcom,bus-freq = <8>;
-				qcom,bus-min = <6>;
-				qcom,bus-max = <10>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L1>;
-			};
-
-			/* SVS_L0 */
-			qcom,gpu-pwrlevel@6 {
-				reg = <6>;
-				qcom,gpu-freq = <660000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS_L0>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS_L0>;
-			};
-
-			/* SVS */
-			qcom,gpu-pwrlevel@7 {
-				reg = <7>;
-				qcom,gpu-freq = <607000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_SVS>;
-
-				qcom,bus-freq = <6>;
-				qcom,bus-min = <4>;
-				qcom,bus-max = <7>;
-
-				qcom,acd-level = <ACD_LEVEL_SVS>;
-			};
-
-			/* Low_SVS_L1 */
-			qcom,gpu-pwrlevel@8 {
-				reg = <8>;
-				qcom,gpu-freq = <525000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_L1>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_L1>;
-			};
-
-			/* Low_SVS */
-			qcom,gpu-pwrlevel@9 {
-				reg = <9>;
-				qcom,gpu-freq = <443000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS>;
-			};
-
-			/* Low_SVS_D0 */
-			qcom,gpu-pwrlevel@10 {
-				reg = <10>;
-				qcom,gpu-freq = <389000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D0>;
-
-				qcom,bus-freq = <4>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <6>;
-
-				qcom,acd-level = <ACD_LEVEL_LOW_SVS_D0>;
-			};
-
-			/* Low_SVS_D1 */
-			qcom,gpu-pwrlevel@11 {
-				reg = <11>;
-				qcom,gpu-freq = <342000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D1>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D2 */
-			qcom,gpu-pwrlevel@12 {
-				reg = <12>;
-				qcom,gpu-freq = <222000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D2>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-
-			/* Low_SVS_D3 */
-			qcom,gpu-pwrlevel@13 {
-				reg = <13>;
-				qcom,gpu-freq = <160000000>;
-				qcom,level = <RPMH_REGULATOR_LEVEL_LOW_SVS_D3>;
-
-				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
-				qcom,bus-max = <3>;
-			};
-		};
-
-		qcom,gpu-pwrlevels-5 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
 			qcom,initial-pwrlevel = <14>;
 			qcom,sku-codes = <SKU_CODE(PCODE_UNKNOWN, FC_UNKNOWN)>;