onmyee/Xperia-X10-Kernel-2.6.29 — comment on commit f3d7f9a6298eab9381f337f776243fa1767ee816
File:  line 0
By onmyee:

1 parent 2331ae9b46 DooMLoRD authored December 24, 2011 Showing 3 changed files with 50 additions and 30 deletions. M kernel/arch/arm/mach-msm/Kconfig 7 ••••• M kernel/arch/arm/mach-msm/Kconfig.backup 7 ••••• M kernel/arch/arm/mach-msm/acpuclock-8x50.c 66 •••• kernel/arch/arm/mach-msm/Kconfig View file @ f3d7f9a ... ... @@ -268,6 +268,13 @@ config DOOM_FS_SERIES 268 268 help 269 269 limit CPU frequencies to stock (DooMKernel X10). 270 270 271 +config DOOM_1113_SERIES 272 + depends on ARCH_QSD8X50 273 + default n 274 + bool "DOOM_1113_SERIES" 275 + help 276 + limit MAX CPU frequency 1113Mhz (DooMKernel X10). 277 + 271 278 endmenu 272 279 273 280 config MSM_STACKED_MEMORY kernel/arch/arm/mach-msm/Kconfig.backup View file @ f3d7f9a ... ... @@ -268,6 +268,13 @@ config DOOM_FS_SERIES 268 268 help 269 269 limit CPU frequencies to stock (DooMKernel X10). 270 270 271 +config DOOM_1113_SERIES 272 + depends on ARCH_QSD8X50 273 + default n 274 + bool "DOOM_1113_SERIES" 275 + help 276 + limit MAX CPU frequency 1113Mhz (DooMKernel X10). 277 + 271 278 endmenu 272 279 273 280 config MSM_STACKED_MEMORY kernel/arch/arm/mach-msm/acpuclock-8x50.c View file @ f3d7f9a ... ... @@ -151,39 +151,39 @@ struct clkctl_acpu_speed acpu_freq_tbl_998_FS[] = { 151 151 { 0, 1267200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x21, 1425}, 152 152 }; 153 153 154 -/* S-series */ 154 +/* 1113-series */ 155 155 156 -struct clkctl_acpu_speed acpu_freq_tbl_998_ S[] = { 156 +struct clkctl_acpu_speed acpu_freq_tbl_998_ 1113[] = { 157 157 { 0, 19200, ACPU_PLL_TCXO, 0, 0, 0, 0, 14000, 0, 0, 1000}, 158 - { 1, 128000, ACPU_PLL_1, 1, 5, 0, 0, 14000, 2, 0, 1000}, 158 + { 1, 128000, ACPU_PLL_1, 1, 5, 0, 0, 14000, 2, 0, 875}, 159 159 // the below frequency may cause screen off reboots if implemented wrongly 160 - { 1, 192000, ACPU_PLL_0, 4, 0, 0, 0, 29000, 0, 0, 1000}, 161 - { 1, 245760, ACPU_PLL_0, 4, 0, 0, 0, 29000, 0, 0, 1000}, 162 - // Update AXI_S and PLL0_S macros if above row numbers change. 163 - { 1, 384000, ACPU_PLL_3, 0, 0, 0, 0, 58000, 1, 0xA, 1000}, 164 - { 0, 422400, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xB, 1000}, 165 - { 1, 460800, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xC, 1000}, 160 + { 1, 192000, ACPU_PLL_0, 4, 0, 0, 0, 29000, 0, 0, 900}, 161 + { 1, 245760, ACPU_PLL_0, 4, 0, 0, 0, 29000, 0, 0, 925}, 162 + //Update AXI_S and PLL0_S macros if above row numbers change. 163 + { 1, 384000, ACPU_PLL_3, 0, 0, 0, 0, 58000, 1, 0xA, 950}, 164 + { 0, 422400, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xB, 950}, 165 + { 1, 460800, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xC, 975}, 166 166 { 0, 499200, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xD, 1000}, 167 167 { 0, 537600, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xE, 1000}, 168 - { 1, 576000, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xF, 1025}, 169 - { 1, 614400, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x10, 1050}, 170 - { 1, 652800, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x11, 1075}, 171 - { 1, 691200, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x12, 1100}, 172 - { 1, 729600, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x13, 1100}, 173 - { 1, 768000, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x14, 1125}, 174 - { 1, 806400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x15, 1150}, 175 - { 1, 844800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x16, 1200}, 168 + { 1, 576000, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0xF, 1000}, 169 + { 0, 614400, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x10, 1050}, 170 + { 1, 652800, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x11, 1050}, 171 + { 0, 691200, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x12, 1100}, 172 + { 0, 729600, ACPU_PLL_3, 0, 0, 0, 0, 117000, 1, 0x13, 1100}, 173 + { 1, 768000, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x14, 1100}, 174 + { 0, 806400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x15, 1150}, 175 + { 1, 844800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x16, 1150}, 176 176 { 0, 883200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x17, 1150}, 177 - { 1, 921600, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x18, 12 5 0}, 177 + { 1, 921600, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x18, 12 0 0}, 178 178 { 0, 960000, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x19, 1250}, 179 - { 1, 998400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1A, 1300}, 180 - { 1, 1036800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1B, 1325}, 181 - { 1, 1075200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1C, 1325}, 182 - { 1, 1113600, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1D, 1350}, 183 - { 1, 1152000, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1E, 1350}, 184 - { 1, 1190400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1F, 1375}, 185 - { 1, 1228800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x20, 1375}, 186 - { 1, 1267200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x21, 1425}, 179 + { 1, 998400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1A, 1250}, 180 + { 1, 1036800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1B, 1275}, 181 + { 1, 1075200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1C, 1300}, 182 + { 1, 1113600, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1D, 1325}, 183 + { 0, 1152000, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1E, 1325}, 184 + { 0, 1190400, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x1F, 1350}, 185 + { 0, 1228800, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x20, 1375}, 186 + { 0, 1267200, ACPU_PLL_3, 0, 0, 0, 0, 128000, 1, 0x21, 1425}, 187 187 }; 188 188 189 189 /* X-series */ ... ... @@ -244,7 +244,11 @@ struct clkctl_acpu_speed acpu_freq_tbl_768[] = { 244 244 #ifdef CONFIG_DOOM_FS_SERIES 245 245 static struct clkctl_acpu_speed *acpu_freq_tbl = acpu_freq_tbl_998_FS; 246 246 #else 247 -static struct clkctl_acpu_speed *acpu_freq_tbl = acpu_freq_tbl_998_S; 247 +#ifdef CONFIG_DOOM_1113_SERIES 248 +static struct clkctl_acpu_speed *acpu_freq_tbl = acpu_freq_tbl_998_1113; 249 +#else 250 +static struct clkctl_acpu_speed *acpu_freq_tbl = acpu_freq_tbl_998_X; 251 +#endif 248 252 #endif 249 253 250 254 #define AXI_S (&acpu_freq_tbl[1]) ... ... @@ -764,11 +768,13 @@ static void __init acpu_freq_tbl_fixup(void) 764 768 case 0x30: 765 769 case 0x00: 766 770 #ifdef CONFIG_DOOM_FS_SERIES 767 - /* FS version */ 768 771 max_acpu_khz = 998400; 769 772 #else 770 - /* S/X version */ 771 - max_acpu_khz = 1228800; //1113600; 773 +#ifdef CONFIG_DOOM_1113_SERIES 774 + max_acpu_khz = 1113600; 775 +#else 776 + max_acpu_khz = 1228800; 777 +#endif 772 778 #endif 773 779 774 780 break; 0 notes on commit f3d7f9a Show line notes below Comments are parsed with GitHub Flavored Markdown Write Preview Tip: You can also add notes to lines in a file. Hover to the left of a line to make a note Comment on this commit Email notifications for these commit notes are on. Disable email notifications for this commit GitHub Links GitHub About Blog Features Contact & Support Training GitHub Enterprise Site Status Tools Gauges: Analyze web traffic Speaker Deck: Presentations Gist: Code snippets GitHub for Mac Issues for iPhone Job Board Extras GitHub Shop The Octodex Documentation GitHub Help Developer API GitHub Flavored Markdown GitHub Pages Terms of Service Privacy Security © 2012 GitHub Inc. All rights reserved. Powered by the Dedicated Servers and Cloud Computing of Rackspace Hosting ® Something went wrong with that request. Please try again. Dismiss