mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
ARM: arm-soc soc updates, take 2
This is the second batch of SoC updates for the 3.6 merge window, containing parts that arrived close to the merge window opening and thus needed to sit in linux-next for a while. Most contents is updates of Renesas shmobile, with a couple of Samsung Exynos patches in the mix. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQFcRrAAoJEIwa5zzehBx3h0kP/1jjLjROWM9IiFyJuF9DMXLX 1GJsB5QDgp6B2Ug9hxoa6W7253UGQ9j+KfpjhdbsxsslQTNM7KMJZ2B3cr2JDepD M8Bl6HOOmFLdi1w7G8LGBa5Xy8U0bj7zebwaXPunwg4pyr4Q+cuvFfON6nnZ6iG6 8Qag4A7DoTtrDYRPat1/ALKdLfysXhQGqMy0PkNkATUe7UUGmPQMwBoVaZ9M6Nt0 +imofMuWvp/KmY9TOxS8Ycnsu31Wdot7qeNufdacfnfWQS2qRCFg6wqvhF6O8TEP vbq0YByqcCun20jVS8G5A+Oj/bSCqhf7CCuG3p+XzL3F4iOaQ9Cr0OFHuWwq4+sP ZR56yDOLVZNVmNHvVcLTGA4zvupeP72nCkCL1Tcbp0oLHkS2fcP1eEDjDM9x5vnl 0t4AKF5lEaltE3brxgZOlzuIpI2f+Hn4tyBz7NXgkhxAUj/TqVm8rhZ4YpwoAYj/ rlT7Y1KAULJk2FQZDiFm5YIUUwldkusJfZjFhQJ5Mf3n7WEBkmMZ9UmgK3Ouf0gF U90GEapPVAllsU9EFI99ccmtXOwuCxXK/wbfrriuimohX6pa0JkKb9OGoIH+LUNU MiOXFGKO5t1xoqXbBQvZegvk1XCBXzQSrU1tnSiXk4MwmWuERkouxm11Bg3yDiGy yrKu/D/ibrz7RLJBa6Ul =1MLz -----END PGP SIGNATURE----- Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc soc updates from Olof Johansson: "This is the second batch of SoC updates for the 3.6 merge window, containing parts that arrived close to the merge window opening and thus needed to sit in linux-next for a while. Most contents is updates of Renesas shmobile, with a couple of Samsung Exynos patches in the mix." * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits) ARM: S3C64XX: Add header file protection macros in pm-core.h [CPUFREQ] EXYNOS5250: Add support max 1.7GHz for EXYNOS5250 ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config ARM: shmobile: Take cpuidle dependencies into account correctly ARM: mach-shmobile: sh7377 generic board support via DT ARM: mach-shmobile: r8a7740 generic board support via DT ARM: shmobile: sh7372: completely switch over to using pm-rmobile API ARM: shmobile: ap4evb: switch to using pm-rmobile API ARM: shmobile: mackerel: switch to using pm-rmobile API ARM: shmobile: sh7372: add pm-rmobile domain support ARM: shmobile: r8a7740: add A4LC pm domain support ARM: shmobile: r8a7740: add A3SP pm domain support ARM: shmobile: r8a7740: add A4S pm domain support ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: shmobile: sh7372 A3SM CPUIdle support ARM: shmobile: Use INTCA with sh7372 A3SM power domain ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register ...
This commit is contained in:
commit
b7574a22a2
35 changed files with 1492 additions and 514 deletions
|
|
@ -65,20 +65,20 @@ static unsigned int clkdiv_cpu0_5250[CPUFREQ_LEVEL_END][8] = {
|
|||
* Clock divider value for following
|
||||
* { ARM, CPUD, ACP, PERIPH, ATB, PCLK_DBG, APLL, ARM2 }
|
||||
*/
|
||||
{ 0, 3, 7, 7, 6, 1, 3, 0 }, /* 1700 MHz - N/A */
|
||||
{ 0, 3, 7, 7, 6, 1, 3, 0 }, /* 1600 MHz - N/A */
|
||||
{ 0, 3, 7, 7, 5, 1, 3, 0 }, /* 1500 MHz - N/A */
|
||||
{ 0, 3, 7, 7, 6, 1, 3, 0 }, /* 1400 MHz */
|
||||
{ 0, 3, 7, 7, 6, 1, 3, 0 }, /* 1300 MHz */
|
||||
{ 0, 3, 7, 7, 5, 1, 3, 0 }, /* 1200 MHz */
|
||||
{ 0, 2, 7, 7, 5, 1, 2, 0 }, /* 1100 MHz */
|
||||
{ 0, 2, 7, 7, 4, 1, 2, 0 }, /* 1000 MHz */
|
||||
{ 0, 2, 7, 7, 4, 1, 2, 0 }, /* 900 MHz */
|
||||
{ 0, 2, 7, 7, 3, 1, 1, 0 }, /* 800 MHz */
|
||||
{ 0, 3, 7, 7, 7, 3, 5, 0 }, /* 1700 MHz */
|
||||
{ 0, 3, 7, 7, 7, 1, 4, 0 }, /* 1600 MHz */
|
||||
{ 0, 2, 7, 7, 7, 1, 4, 0 }, /* 1500 MHz */
|
||||
{ 0, 2, 7, 7, 6, 1, 4, 0 }, /* 1400 MHz */
|
||||
{ 0, 2, 7, 7, 6, 1, 3, 0 }, /* 1300 MHz */
|
||||
{ 0, 2, 7, 7, 5, 1, 3, 0 }, /* 1200 MHz */
|
||||
{ 0, 3, 7, 7, 5, 1, 3, 0 }, /* 1100 MHz */
|
||||
{ 0, 1, 7, 7, 4, 1, 2, 0 }, /* 1000 MHz */
|
||||
{ 0, 1, 7, 7, 4, 1, 2, 0 }, /* 900 MHz */
|
||||
{ 0, 1, 7, 7, 4, 1, 2, 0 }, /* 800 MHz */
|
||||
{ 0, 1, 7, 7, 3, 1, 1, 0 }, /* 700 MHz */
|
||||
{ 0, 1, 7, 7, 2, 1, 1, 0 }, /* 600 MHz */
|
||||
{ 0, 1, 7, 7, 3, 1, 1, 0 }, /* 600 MHz */
|
||||
{ 0, 1, 7, 7, 2, 1, 1, 0 }, /* 500 MHz */
|
||||
{ 0, 1, 7, 7, 1, 1, 1, 0 }, /* 400 MHz */
|
||||
{ 0, 1, 7, 7, 2, 1, 1, 0 }, /* 400 MHz */
|
||||
{ 0, 1, 7, 7, 1, 1, 1, 0 }, /* 300 MHz */
|
||||
{ 0, 1, 7, 7, 1, 1, 1, 0 }, /* 200 MHz */
|
||||
};
|
||||
|
|
@ -87,9 +87,9 @@ static unsigned int clkdiv_cpu1_5250[CPUFREQ_LEVEL_END][2] = {
|
|||
/* Clock divider value for following
|
||||
* { COPY, HPM }
|
||||
*/
|
||||
{ 0, 2 }, /* 1700 MHz - N/A */
|
||||
{ 0, 2 }, /* 1600 MHz - N/A */
|
||||
{ 0, 2 }, /* 1500 MHz - N/A */
|
||||
{ 0, 2 }, /* 1700 MHz */
|
||||
{ 0, 2 }, /* 1600 MHz */
|
||||
{ 0, 2 }, /* 1500 MHz */
|
||||
{ 0, 2 }, /* 1400 MHz */
|
||||
{ 0, 2 }, /* 1300 MHz */
|
||||
{ 0, 2 }, /* 1200 MHz */
|
||||
|
|
@ -106,10 +106,10 @@ static unsigned int clkdiv_cpu1_5250[CPUFREQ_LEVEL_END][2] = {
|
|||
};
|
||||
|
||||
static unsigned int exynos5_apll_pms_table[CPUFREQ_LEVEL_END] = {
|
||||
(0), /* 1700 MHz - N/A */
|
||||
(0), /* 1600 MHz - N/A */
|
||||
(0), /* 1500 MHz - N/A */
|
||||
(0), /* 1400 MHz */
|
||||
((425 << 16) | (6 << 8) | 0), /* 1700 MHz */
|
||||
((200 << 16) | (3 << 8) | 0), /* 1600 MHz */
|
||||
((250 << 16) | (4 << 8) | 0), /* 1500 MHz */
|
||||
((175 << 16) | (3 << 8) | 0), /* 1400 MHz */
|
||||
((325 << 16) | (6 << 8) | 0), /* 1300 MHz */
|
||||
((200 << 16) | (4 << 8) | 0), /* 1200 MHz */
|
||||
((275 << 16) | (6 << 8) | 0), /* 1100 MHz */
|
||||
|
|
@ -126,9 +126,10 @@ static unsigned int exynos5_apll_pms_table[CPUFREQ_LEVEL_END] = {
|
|||
|
||||
/* ASV group voltage table */
|
||||
static const unsigned int asv_voltage_5250[CPUFREQ_LEVEL_END] = {
|
||||
0, 0, 0, 0, 0, 0, 0, /* 1700 MHz ~ 1100 MHz Not supported */
|
||||
1175000, 1125000, 1075000, 1050000, 1000000,
|
||||
950000, 925000, 925000, 900000
|
||||
1300000, 1250000, 1225000, 1200000, 1150000,
|
||||
1125000, 1100000, 1075000, 1050000, 1025000,
|
||||
1012500, 1000000, 975000, 950000, 937500,
|
||||
925000
|
||||
};
|
||||
|
||||
static void set_clkdiv(unsigned int div_index)
|
||||
|
|
@ -248,15 +249,7 @@ static void __init set_volt_table(void)
|
|||
{
|
||||
unsigned int i;
|
||||
|
||||
exynos5250_freq_table[L0].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L1].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L2].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L3].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L4].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L5].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
exynos5250_freq_table[L6].frequency = CPUFREQ_ENTRY_INVALID;
|
||||
|
||||
max_support_idx = L7;
|
||||
max_support_idx = L0;
|
||||
|
||||
for (i = 0 ; i < CPUFREQ_LEVEL_END ; i++)
|
||||
exynos5250_volt_table[i] = asv_voltage_5250[i];
|
||||
|
|
|
|||
Loading…
Reference in a new issue