evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[MIPS] Au1xx0 code sets incorrect mips_hpt_frequency

Browse source 
Alchemy CPU counter ticks at the full CPU clock speed.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Sergei Shtylyov 2006-09-03 22:17:10 +04:00 • committed by Ralf Baechle
parent be609f3546
commit 53c1b192ec
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/mips/au1000/common/time.c
View file

@ -231,7 +231,6 @@ wakeup_counter0_set(int ticks)
*/ */
unsigned long cal_r4koff(void) unsigned long cal_r4koff(void)
{ {
unsigned long count;
unsigned long cpu_speed; unsigned long cpu_speed;
unsigned long flags; unsigned long flags;
unsigned long counter; unsigned long counter;
@ -258,7 +257,7 @@ unsigned long cal_r4koff(void)
#if defined(CONFIG_AU1000_USE32K) #if defined(CONFIG_AU1000_USE32K)
{ {
unsigned long start, end; unsigned long start, end, count;
start = au_readl(SYS_RTCREAD); start = au_readl(SYS_RTCREAD);
start += 2; start += 2;
@ -282,7 +281,6 @@ unsigned long cal_r4koff(void)
#else #else
cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) *
AU1000_SRC_CLK; AU1000_SRC_CLK;
count = cpu_speed / 2;
#endif #endif
} }
else { else {
@ -291,10 +289,9 @@ unsigned long cal_r4koff(void)
* NOTE: some old silicon doesn't allow reading the PLL. * NOTE: some old silicon doesn't allow reading the PLL.
*/ */
cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK; cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK;
count = cpu_speed / 2;
no_au1xxx_32khz = 1; no_au1xxx_32khz = 1;
} }
mips_hpt_frequency = count; mips_hpt_frequency = cpu_speed;
// Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16)
set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
spin_unlock_irqrestore(&time_lock, flags); spin_unlock_irqrestore(&time_lock, flags);