mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 11:32:04 +00:00
OMAP3 clock: Fixed processing of bootarg 'mpurate'
The argument 'mpurate' had no effect on the MPU frequency. This patch fixes the same. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
parent
6dda2d4b13
commit
11b66383aa
@ -27,6 +27,7 @@
|
||||
#include <linux/limits.h>
|
||||
#include <linux/bitops.h>
|
||||
|
||||
#include <mach/cpu.h>
|
||||
#include <mach/clock.h>
|
||||
#include <mach/sram.h>
|
||||
#include <asm/div64.h>
|
||||
@ -1067,17 +1068,17 @@ static int __init omap2_clk_arch_init(void)
|
||||
return -EINVAL;
|
||||
|
||||
/* REVISIT: not yet ready for 343x */
|
||||
#if 0
|
||||
if (clk_set_rate(&virt_prcm_set, mpurate))
|
||||
printk(KERN_ERR "Could not find matching MPU rate\n");
|
||||
#endif
|
||||
if (clk_set_rate(&dpll1_ck, mpurate))
|
||||
printk(KERN_ERR "*** Unable to set MPU rate\n");
|
||||
|
||||
recalculate_root_clocks();
|
||||
|
||||
printk(KERN_INFO "Switched to new clocking rate (Crystal/DPLL3/MPU): "
|
||||
printk(KERN_INFO "Switched to new clocking rate (Crystal/Core/MPU): "
|
||||
"%ld.%01ld/%ld/%ld MHz\n",
|
||||
(osc_sys_ck.rate / 1000000), (osc_sys_ck.rate / 100000) % 10,
|
||||
(core_ck.rate / 1000000), (dpll1_fck.rate / 1000000)) ;
|
||||
(osc_sys_ck.rate / 1000000), ((osc_sys_ck.rate / 100000) % 10),
|
||||
(core_ck.rate / 1000000), (arm_fck.rate / 1000000)) ;
|
||||
|
||||
calibrate_delay();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1136,7 +1137,7 @@ int __init omap2_clk_init(void)
|
||||
|
||||
recalculate_root_clocks();
|
||||
|
||||
printk(KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): "
|
||||
printk(KERN_INFO "Clocking rate (Crystal/Core/MPU): "
|
||||
"%ld.%01ld/%ld/%ld MHz\n",
|
||||
(osc_sys_ck.rate / 1000000), (osc_sys_ck.rate / 100000) % 10,
|
||||
(core_ck.rate / 1000000), (arm_fck.rate / 1000000));
|
||||
|
Loading…
Reference in New Issue
Block a user