msm: acpuclock-8974: Update 8974v2 CPU->L2->Bandwidth mappings

Testing has shown that updated CPU and L2 mapping may improve
power and performance. Implement these updates.

Change-Id: Ia2b1d612ef5cc06a5aeb2de205acc4d594af59fb
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/acpuclock-8974.c b/arch/arm/mach-msm/acpuclock-8974.c
index c960516..b673f93 100644
--- a/arch/arm/mach-msm/acpuclock-8974.c
+++ b/arch/arm/mach-msm/acpuclock-8974.c
@@ -260,451 +260,451 @@
 static struct l2_level l2_freq_tbl_v2[] __initdata = {
 	[0]  = { {  300000, PLL_0, 0,   0 }, LVL_LOW,   950000, 0 },
 	[1]  = { {  345600, HFPLL, 2,  36 }, LVL_LOW,   950000, 1 },
-	[2]  = { {  422400, HFPLL, 2,  44 }, LVL_LOW,   950000, 1 },
-	[3]  = { {  499200, HFPLL, 2,  52 }, LVL_LOW,   950000, 2 },
-	[4]  = { {  576000, HFPLL, 1,  30 }, LVL_LOW,   950000, 3 },
-	[5]  = { {  652800, HFPLL, 1,  34 }, LVL_NOM,   950000, 3 },
-	[6]  = { {  729600, HFPLL, 1,  38 }, LVL_NOM,   950000, 3 },
+	[2]  = { {  422400, HFPLL, 2,  44 }, LVL_LOW,   950000, 2 },
+	[3]  = { {  499200, HFPLL, 2,  52 }, LVL_LOW,   950000, 3 },
+	[4]  = { {  576000, HFPLL, 1,  30 }, LVL_LOW,   950000, 4 },
+	[5]  = { {  652800, HFPLL, 1,  34 }, LVL_NOM,   950000, 4 },
+	[6]  = { {  729600, HFPLL, 1,  38 }, LVL_NOM,   950000, 4 },
 	[7]  = { {  806400, HFPLL, 1,  42 }, LVL_NOM,   950000, 4 },
-	[8]  = { {  883200, HFPLL, 1,  46 }, LVL_NOM,   950000, 4 },
-	[9]  = { {  960000, HFPLL, 1,  50 }, LVL_NOM,   950000, 4 },
-	[10] = { { 1036800, HFPLL, 1,  54 }, LVL_NOM,   950000, 5 },
-	[11] = { { 1113600, HFPLL, 1,  58 }, LVL_HIGH, 1050000, 5 },
+	[8]  = { {  883200, HFPLL, 1,  46 }, LVL_NOM,   950000, 5 },
+	[9]  = { {  960000, HFPLL, 1,  50 }, LVL_NOM,   950000, 5 },
+	[10] = { { 1036800, HFPLL, 1,  54 }, LVL_NOM,   950000, 6 },
+	[11] = { { 1113600, HFPLL, 1,  58 }, LVL_HIGH, 1050000, 6 },
 	[12] = { { 1190400, HFPLL, 1,  62 }, LVL_HIGH, 1050000, 6 },
-	[13] = { { 1267200, HFPLL, 1,  66 }, LVL_HIGH, 1050000, 6 },
+	[13] = { { 1267200, HFPLL, 1,  66 }, LVL_HIGH, 1050000, 7 },
 	[14] = { { 1344000, HFPLL, 1,  70 }, LVL_HIGH, 1050000, 7 },
 	[15] = { { 1420800, HFPLL, 1,  74 }, LVL_HIGH, 1050000, 7 },
 	[16] = { { 1497600, HFPLL, 1,  78 }, LVL_HIGH, 1050000, 7 },
-	[17] = { { 1574400, HFPLL, 1,  82 }, LVL_HIGH, 1050000, 8 },
-	[18] = { { 1651200, HFPLL, 1,  86 }, LVL_HIGH, 1050000, 8 },
+	[17] = { { 1574400, HFPLL, 1,  82 }, LVL_HIGH, 1050000, 7 },
+	[18] = { { 1651200, HFPLL, 1,  86 }, LVL_HIGH, 1050000, 7 },
 	[19] = { { 1728000, HFPLL, 1,  90 }, LVL_HIGH, 1050000, 8 },
 	{ }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs0[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   815000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   825000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   835000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   845000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   855000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   865000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   875000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  890000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  900000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  915000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  815000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  825000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  835000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  845000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  855000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  865000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  875000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  890000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  900000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  915000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  925000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  940000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  950000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  965000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  980000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  995000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16), 1010000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16), 1025000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16), 1040000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16), 1055000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1070000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1085000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  940000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  950000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  965000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  980000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  995000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16), 1010000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17), 1025000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17), 1040000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18), 1055000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1070000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1085000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1100000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs1[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   800000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   810000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   820000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   830000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   840000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   850000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   860000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  875000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  885000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  895000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  800000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  810000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  820000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  830000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  840000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  850000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  860000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  875000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  885000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  895000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  910000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  920000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  930000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  945000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  960000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  975000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  990000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16), 1005000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16), 1020000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16), 1030000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1045000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1060000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  920000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  930000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  945000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  960000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  975000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  990000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17), 1005000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17), 1020000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18), 1030000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1045000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1060000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1075000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs2[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   785000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   795000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   805000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   815000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   825000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   835000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   845000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  855000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  865000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  875000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  785000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  795000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  805000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  815000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  825000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  835000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  845000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  855000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  865000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  875000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  890000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  900000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  910000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  925000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  940000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  955000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  970000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  980000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  995000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16), 1005000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1020000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1035000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  900000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  910000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  925000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  940000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  955000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  970000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  980000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  995000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18), 1005000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1020000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1035000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1050000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs3[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   780000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   790000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   800000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   810000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   820000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   830000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  840000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  850000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  860000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  780000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  790000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  800000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  810000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  820000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  830000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  840000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  850000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  860000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  875000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  885000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  895000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  910000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  925000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  935000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  950000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  960000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  970000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  985000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  995000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1010000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  885000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  895000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  910000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  925000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  935000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  950000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  960000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  970000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  985000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  995000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1010000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1025000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs4[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   780000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   790000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   800000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   810000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   820000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  830000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  840000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  850000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  780000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  790000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  800000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  810000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  820000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  830000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  840000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  850000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  860000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  870000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  880000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  895000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  910000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  920000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  930000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  940000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  950000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  960000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  975000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  985000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  870000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  880000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  895000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  910000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  920000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  930000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  940000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  950000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  960000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  975000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  985000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1000000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs5[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   750000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   760000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   770000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   780000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   790000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   800000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   810000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  820000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  830000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  840000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  750000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  760000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  770000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  780000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  790000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  800000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  810000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  820000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  830000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  840000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  850000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  860000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  870000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  880000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  890000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  900000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  920000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  930000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  940000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  955000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  965000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  860000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  870000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  880000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  890000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  900000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  920000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  930000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  940000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  955000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  965000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  975000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2g_pvs6[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   750000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   750000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   760000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   770000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   780000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   790000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   800000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  810000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  820000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  830000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  750000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  750000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  760000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  770000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  780000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  790000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  800000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  810000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  820000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  830000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  840000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  850000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  860000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  870000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  875000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  885000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  905000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  915000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  920000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  930000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  940000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  850000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  860000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  870000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  875000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  885000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  905000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  915000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  920000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  930000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  940000, 3200000 },
 	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  950000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs0[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   800000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   800000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   805000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   815000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   825000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   835000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   845000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  855000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  865000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  875000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  800000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  800000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  805000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  815000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  825000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  835000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  845000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  855000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  865000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  875000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  890000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  900000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  915000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  925000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  940000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  950000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  965000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  980000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  995000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16), 1010000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1025000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1040000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19), 1055000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1070000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  900000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  915000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  925000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  940000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  950000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  965000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  980000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  995000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18), 1010000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1025000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1040000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1055000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1070000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1085000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19), 1100000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs1[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   800000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   800000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   800000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   800000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   810000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   820000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   830000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  840000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  850000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  860000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  800000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  800000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  800000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  800000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  810000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  820000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  830000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  840000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  850000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  860000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  875000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  885000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  895000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  910000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  920000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  930000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  945000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  960000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  975000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  990000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1005000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1020000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19), 1030000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1045000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  885000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  895000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  910000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  920000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  930000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  945000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  960000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  975000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  990000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1005000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1020000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1030000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1045000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1060000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19), 1075000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs2[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   785000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   795000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   805000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   815000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  825000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  835000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  845000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  785000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  795000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  805000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  815000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  825000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  835000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  845000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  855000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  865000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  875000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  890000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  900000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  910000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  925000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  940000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  955000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  970000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  980000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  995000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19), 1005000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1020000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  865000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  875000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  890000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  900000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  910000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  925000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  940000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  955000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  970000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  980000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  995000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1005000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1020000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1035000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19), 1050000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs3[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   775000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   780000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   790000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   800000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  810000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  820000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  830000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  775000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  780000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  790000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  800000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  810000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  820000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  830000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  840000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  850000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  860000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  875000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  885000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  895000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  925000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  935000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  950000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  960000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  970000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  985000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  995000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  850000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  860000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  875000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  885000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  895000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  925000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  935000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  950000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  960000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  970000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  985000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  995000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1010000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19), 1025000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs4[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   775000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   775000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   780000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   790000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  800000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  810000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  820000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  775000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  775000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  780000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  790000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  800000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  810000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  820000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  830000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  840000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  850000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  860000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  870000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  880000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  910000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  920000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  930000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  940000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  950000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  960000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  975000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  840000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  850000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  860000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  870000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  880000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  910000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  920000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  930000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  940000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  950000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  960000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  975000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  985000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19), 1000000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs5[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   750000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   750000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   750000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   750000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   760000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   770000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   780000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  790000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  800000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  810000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  750000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  750000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  750000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  750000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  760000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  770000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  780000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  790000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  800000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  810000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  820000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  830000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  840000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  850000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  860000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  870000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  880000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  890000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  900000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  910000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  920000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  930000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  940000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  955000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  830000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  840000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  850000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  860000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  870000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  880000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  890000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  900000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  910000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  920000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  930000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  940000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  955000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  965000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19),  975000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p2g_pvs6[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   75000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   75000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   75000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   75000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   75000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   76000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   77000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  78000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  79000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  80000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  75000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  75000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  75000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  75000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  75000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  76000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  77000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  78000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  79000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  80000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  81000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  82000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  83000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  84000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  85000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  86000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  87000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  87500, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  88500, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  89500, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  90500, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  91500, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  92000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  93000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  82000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  83000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  84000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  85000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  86000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  87000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  87500, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  88500, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  89500, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  90500, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  91500, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  92000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  93000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  94000, 3200000 },
 	{ 1, { 2150400, HFPLL, 1, 112 }, L2(19),  95000, 3200000 },
 	{ 0, { 0 } }
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs0[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   800000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   800000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   800000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   805000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   815000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   825000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   835000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  845000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  855000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  865000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  800000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  800000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  800000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  805000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  815000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  825000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  835000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  845000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  855000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  865000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  875000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  890000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  900000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  915000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  925000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  940000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  950000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  965000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  980000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  995000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19), 1010000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1025000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19), 1040000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1055000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  890000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  900000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  915000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  925000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  940000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  950000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  965000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  980000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  995000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18), 1010000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1025000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1040000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1055000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1070000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1085000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1100000, 3200000 },
@@ -712,30 +712,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs1[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   800000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   800000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   800000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   800000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   800000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   810000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   820000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  830000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  840000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  850000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  800000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  800000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  800000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  800000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  800000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  810000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  820000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  830000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  840000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  850000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  860000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  875000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  885000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  895000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  910000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  920000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  930000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  945000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  960000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  975000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  990000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19), 1005000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19), 1020000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1030000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  875000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  885000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  895000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  910000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  920000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  930000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  945000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  960000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  975000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  990000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18), 1005000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19), 1020000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1030000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1045000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1060000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1075000, 3200000 },
@@ -743,30 +743,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs2[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   775000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   785000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   795000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   805000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  815000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  825000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  835000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  775000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  785000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  795000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  805000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  815000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  825000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  835000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  845000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  855000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  865000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  875000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  890000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  900000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  925000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  940000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  955000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  970000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  980000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  995000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19), 1005000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  855000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  865000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  875000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  890000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  900000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  910000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  925000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  940000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  955000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  970000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  980000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  995000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19), 1005000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1020000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1035000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1050000, 3200000 },
@@ -774,30 +774,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs3[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   775000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   775000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   780000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   790000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  800000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  810000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  820000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  775000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  775000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  780000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  790000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  800000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  810000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  820000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  830000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  840000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  850000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  860000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  875000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  885000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  910000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  925000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  935000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  950000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  960000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  970000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  985000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  840000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  850000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  860000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  875000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  885000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  895000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  910000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  925000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  935000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  950000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  960000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  970000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  985000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  995000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1010000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1025000, 3200000 },
@@ -805,30 +805,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs4[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   775000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   775000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   775000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   775000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   775000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   775000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   780000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  790000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  800000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  810000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  775000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  775000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  775000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  775000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  775000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  775000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  780000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  790000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  800000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  810000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  820000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  830000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  840000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  850000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  860000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  870000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  880000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  895000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  910000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  920000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  930000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  940000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  950000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  960000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  830000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  840000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  850000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  860000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  870000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  880000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  895000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  910000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  920000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  930000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  940000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  950000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  960000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  975000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19),  985000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1000000, 3200000 },
@@ -836,30 +836,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs5[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   750000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   750000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   750000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   750000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   750000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   760000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   770000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  780000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  790000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  800000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  750000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  750000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  750000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  750000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  750000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  760000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  770000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  780000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  790000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  800000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  810000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  820000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  830000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  840000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  850000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  860000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  870000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  880000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  890000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  900000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  910000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  920000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  930000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  940000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  820000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  830000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  840000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  850000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  860000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  870000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  880000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  890000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  900000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  910000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  920000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  930000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  940000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  955000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19),  965000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19),  975000, 3200000 },
@@ -867,30 +867,30 @@
 };
 
 static struct acpu_level acpu_freq_tbl_2p3g_pvs6[] __initdata = {
-	{ 1, {  300000, PLL_0, 0,   0 }, L2(0),   750000,  400000 },
-	{ 0, {  345600, HFPLL, 2,  36 }, L2(3),   750000, 3200000 },
-	{ 1, {  422400, HFPLL, 2,  44 }, L2(3),   750000, 3200000 },
-	{ 0, {  499200, HFPLL, 2,  52 }, L2(6),   750000, 3200000 },
-	{ 1, {  576000, HFPLL, 1,  30 }, L2(6),   750000, 3200000 },
-	{ 1, {  652800, HFPLL, 1,  34 }, L2(7),   750000, 3200000 },
-	{ 1, {  729600, HFPLL, 1,  38 }, L2(7),   760000, 3200000 },
-	{ 0, {  806400, HFPLL, 1,  42 }, L2(10),  770000, 3200000 },
-	{ 1, {  883200, HFPLL, 1,  46 }, L2(10),  780000, 3200000 },
-	{ 0, {  960000, HFPLL, 1,  50 }, L2(10),  790000, 3200000 },
+	{ 1, {  300000, PLL_0, 0,   0 },  L2(0),  750000,  400000 },
+	{ 0, {  345600, HFPLL, 2,  36 },  L2(1),  750000, 3200000 },
+	{ 1, {  422400, HFPLL, 2,  44 },  L2(2),  750000, 3200000 },
+	{ 0, {  499200, HFPLL, 2,  52 },  L2(2),  750000, 3200000 },
+	{ 0, {  576000, HFPLL, 1,  30 },  L2(3),  750000, 3200000 },
+	{ 1, {  652800, HFPLL, 1,  34 },  L2(3),  750000, 3200000 },
+	{ 1, {  729600, HFPLL, 1,  38 },  L2(4),  760000, 3200000 },
+	{ 0, {  806400, HFPLL, 1,  42 },  L2(4),  770000, 3200000 },
+	{ 1, {  883200, HFPLL, 1,  46 },  L2(4),  780000, 3200000 },
+	{ 1, {  960000, HFPLL, 1,  50 },  L2(9),  790000, 3200000 },
 	{ 1, { 1036800, HFPLL, 1,  54 }, L2(10),  800000, 3200000 },
-	{ 0, { 1113600, HFPLL, 1,  58 }, L2(12),  810000, 3200000 },
-	{ 0, { 1190400, HFPLL, 1,  62 }, L2(12),  820000, 3200000 },
-	{ 0, { 1267200, HFPLL, 1,  66 }, L2(12),  830000, 3200000 },
-	{ 1, { 1344000, HFPLL, 1,  70 }, L2(12),  840000, 3200000 },
-	{ 0, { 1420800, HFPLL, 1,  74 }, L2(16),  850000, 3200000 },
-	{ 0, { 1497600, HFPLL, 1,  78 }, L2(16),  860000, 3200000 },
-	{ 0, { 1574400, HFPLL, 1,  82 }, L2(16),  870000, 3200000 },
-	{ 0, { 1651200, HFPLL, 1,  86 }, L2(16),  875000, 3200000 },
-	{ 1, { 1728000, HFPLL, 1,  90 }, L2(16),  885000, 3200000 },
-	{ 0, { 1804800, HFPLL, 1,  94 }, L2(19),  895000, 3200000 },
-	{ 0, { 1881600, HFPLL, 1,  98 }, L2(19),  905000, 3200000 },
-	{ 0, { 1958400, HFPLL, 1, 102 }, L2(19),  915000, 3200000 },
-	{ 1, { 2035200, HFPLL, 1, 106 }, L2(19),  920000, 3200000 },
+	{ 0, { 1113600, HFPLL, 1,  58 }, L2(10),  810000, 3200000 },
+	{ 1, { 1190400, HFPLL, 1,  62 }, L2(10),  820000, 3200000 },
+	{ 1, { 1267200, HFPLL, 1,  66 }, L2(13),  830000, 3200000 },
+	{ 0, { 1344000, HFPLL, 1,  70 }, L2(14),  840000, 3200000 },
+	{ 0, { 1420800, HFPLL, 1,  74 }, L2(15),  850000, 3200000 },
+	{ 1, { 1497600, HFPLL, 1,  78 }, L2(16),  860000, 3200000 },
+	{ 1, { 1574400, HFPLL, 1,  82 }, L2(17),  870000, 3200000 },
+	{ 0, { 1651200, HFPLL, 1,  86 }, L2(17),  875000, 3200000 },
+	{ 1, { 1728000, HFPLL, 1,  90 }, L2(18),  885000, 3200000 },
+	{ 0, { 1804800, HFPLL, 1,  94 }, L2(18),  895000, 3200000 },
+	{ 0, { 1881600, HFPLL, 1,  98 }, L2(18),  905000, 3200000 },
+	{ 1, { 1958400, HFPLL, 1, 102 }, L2(19),  915000, 3200000 },
+	{ 0, { 2035200, HFPLL, 1, 106 }, L2(19),  920000, 3200000 },
 	{ 0, { 2112000, HFPLL, 1, 110 }, L2(19),  930000, 3200000 },
 	{ 0, { 2188800, HFPLL, 1, 114 }, L2(19),  940000, 3200000 },
 	{ 1, { 2265600, HFPLL, 1, 118 }, L2(19),  950000, 3200000 },