Fixed processing of bootarg 'mpurate'
PATCH 1/1 Fixed processing of bootarg 'mpurate'
The argument 'mpurate' had no effect on the MPU
frequency. This patch fixes the same.
It also ensures that DSP frequency is set according to the OPP definitions.
--- arch/arm/mach-omap2/clock34xx.c | 57 +++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/clock34xx.c +52 -5
@@ -29,6 +29,7 @@#include <linux/err.h> #include <linux/cpufreq.h> +#include <mach/cpu.h> #include <mach/clock.h> #include <mach/sram.h> #include <mach/omap-pm.h>
@@ -42,6 +43,7 @@#include "prm-regbits-34xx.h" #include "cm.h" #include "cm-regbits-34xx.h" +#include "omap3-opp.h" static const struct clkops clkops_noncore_dpll_ops;
@@ -1083,6 +1085,11 @@ void omap2_clk_prepare_for_reboot(void)*/ static int __init omap2_clk_arch_init (void ) { +unsigned short opp=0 ; +unsigned short i; +unsigned long dsprate; +struct omap_opp *opp_table; +if (!mpurate)return -EINVAL ;
@@ -1092,12 +1099,49 @@ static int __init omap2_clk_arch_init(void)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" ); +omap3_dpll_recalc (&dpll1_ck); + +/* Get the OPP corresponding to the mpurate */ +if (mpu_opps) { + opp_table = mpu_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].rate == mpurate) +break ; + + opp = opp_table[i].opp_id; + +pr_debug ("Switched to OPP:%d\n" , opp); + } + +/* Get dsprate corresponding to the opp */ +if ((dsp_opps) && (opp >=VDD1_OPP1 ) && (opp <=VDD1_OPP5 )) { + opp_table = dsp_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].opp_id == opp) +break ; + + dsprate = opp_table[i].rate; + +if (clk_set_rate (&dpll2_ck, dsprate)) +printk (KERN_ERR "*** Unable to set IVA2 rate\n" ); +omap3_dpll_recalc (&dpll2_ck); + } +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 ), (dpll1_ck.rate /1000000 )) ; + +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ; + +calibrate_delay ();return 0 ; }
@@ -1156,10 +1200,13 @@ int __init omap2_clk_init(void)recalculate_root_clocks (); -printk (KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): " +printk (KERN_INFO "Clocking rate (Crystal/DPLL/MPU core): " "%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 )); + (core_ck.rate /1000000 ), (dpll1_ck.rate /1000000 )); + +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ;/* * Only enable those clocks we will need, let the drivers
Signature · 1 line
1.6.2.2
Quoted 7 lines · Sanjeev Premi
The argument 'mpurate' had no effect on the MPU
frequency. This patch fixes the same.It also ensures that DSP frequency is set according to the OPP definitions.
Signed-off-by Sanjeev Premi <[email protected]>
Can you break this into two patches. One that simply fixes the MPU rate setting bug and that applies against linux-omap master and can be queued for omap-fixes.
The DSP rate setting is a separate problem and could be done in a patch against the PM branch.
Kevin
Quoted 112 lines
--- arch/arm/mach-omap2/clock34xx.c | 57 +++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 5 deletions(-)arch/arm/mach-omap2/clock34xx.c +52
-5@@ -29,6 +29,7 @@#include <linux/err.h> #include <linux/cpufreq.h> +#include <mach/cpu.h> #include <mach/clock.h> #include <mach/sram.h> #include <mach/omap-pm.h> @@ -42,6 +43,7 @@#include "prm-regbits-34xx.h" #include "cm.h" #include "cm-regbits-34xx.h" +#include "omap3-opp.h" static const struct clkops clkops_noncore_dpll_ops;@@ -1083,6 +1085,11 @@ void omap2_clk_prepare_for_reboot(void)*/ static int __init omap2_clk_arch_init (void ) { +unsigned short opp=0 ; +unsigned short i; +unsigned long dsprate; +struct omap_opp *opp_table; +if (!mpurate)return -EINVAL ;@@ -1092,12 +1099,49 @@ static int __init omap2_clk_arch_init(void)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" ); +omap3_dpll_recalc (&dpll1_ck); + +/* Get the OPP corresponding to the mpurate */ +if (mpu_opps) { + opp_table = mpu_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].rate == mpurate) +break ; + + opp = opp_table[i].opp_id; + +pr_debug ("Switched to OPP:%d\n" , opp); + } + +/* Get dsprate corresponding to the opp */ +if ((dsp_opps) && (opp >=VDD1_OPP1 ) && (opp <=VDD1_OPP5 )) { + opp_table = dsp_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].opp_id == opp) +break ; + + dsprate = opp_table[i].rate; + +if (clk_set_rate (&dpll2_ck, dsprate)) +printk (KERN_ERR "*** Unable to set IVA2 rate\n" ); +omap3_dpll_recalc (&dpll2_ck); + } +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 ), (dpll1_ck.rate /1000000 )) ; + +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ; + +calibrate_delay ();return 0 ; }@@ -1156,10 +1200,13 @@ int __init omap2_clk_init(void)recalculate_root_clocks (); -printk (KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): " +printk (KERN_INFO "Clocking rate (Crystal/DPLL/MPU core): " "%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 )); + (core_ck.rate /1000000 ), (dpll1_ck.rate /1000000 )); + +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ;/* * Only enable those clocks we will need, let the drivers Signature · 6 lines
1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 12 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Thursday, August 06, 2009 8:04 PM
To: Premi, Sanjeev
Cc: [email protected]
Subject: Re: [PATCH] Fixed processing of bootarg 'mpurate'Quoted 3 lines · Sanjeev Premi
The argument 'mpurate' had no effect on the MPU frequency. This patch fixes the same.
Quoted 8 lines
Quoted 4 lines
It also ensures that DSP frequency is set according to the OPP definitions.
Signed-off-by Sanjeev Premi <[email protected]>Can you break this into two patches. One that simply fixes the MPU rate setting bug and that applies against linux-omap master and can be queued for omap-fixes.
Created a patch on l-o master against the commit:
4baadee : OMAP3: EHCI: Allow EHCI to work as a module again
Quoted 2 lines
The DSP rate setting is a separate problem and could be done in a patch against the PM branch.
Based on the patch for mpurate, a created another one for setting the dsp frequency against pm branch:
70a1f22 : OMAP3: PM: USBHOST: clear wakeup events on both hosts
Both patches follow this mail.
Best regards,
Sanjeev
Quoted 128 lines
Kevin
Quoted 2 lines
--- arch/arm/mach-omap2/clock34xx.c | 57+++++++++++++++++++++++++++++++++++---
Review
Quoted 3 lines
1 files changed, 52 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-omap2/clock34xx.cQuoted 54 lines
index c2e5ef8..a9e7e82 100644
arch/arm/mach-omap2/clock34xx.c +26
-0@@ -29,6 +29,7 @@#include <linux/err.h> #include <linux/cpufreq.h> +#include <mach/cpu.h> #include <mach/clock.h> #include <mach/sram.h> #include <mach/omap-pm.h> @@ -42,6 +43,7 @@#include "prm-regbits-34xx.h" #include "cm.h" #include "cm-regbits-34xx.h" +#include "omap3-opp.h" static const struct clkops clkops_noncore_dpll_ops;@@ -1083,6 +1085,11 @@ void omap2_clk_prepare_for_reboot(void)*/ static int __init omap2_clk_arch_init (void ) { +unsigned short opp=0 ; +unsigned short i; +unsigned long dsprate; +struct omap_opp *opp_table; +if (!mpurate)return -EINVAL ;@@ -1092,12 +1099,49 @@ static int __init omap2_clk_arch_init(void)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" ); +omap3_dpll_recalc (&dpll1_ck); + +/* Get the OPP corresponding to the mpurate */ +if (mpu_opps) { + opp_table = mpu_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].rate == mpurate) +break ; + + opp = opp_table[i].opp_id; + +pr_debug ("Switched to OPP:%d\n" , opp); + } + +/* Get dsprate corresponding to the opp */ +if ((dsp_opps) && (opp >=VDD1_OPP1 ) && (opp <=VDD1_OPP5 )) {arch/arm/mach-omap2/clock34xx.c static int __init omap2_clk_arch_init(void) · line 1130
Quoted 10 lines
arch/arm/mach-omap2/clock34xx.c +10
-0+ opp_table = dsp_opps; + +for (i=0 ; opp_table[i].opp_id <=MAX_VDD1_OPP ; i++) +if (opp_table[i].opp_id == opp) +break ; + + dsprate = opp_table[i].rate; + +if (clk_set_rate (&dpll2_ck, dsprate)) + printk(KERN_ERR "*** Unable to set IVA2rate\n");
arch/arm/mach-omap2/clock34xx.c static int __init omap2_clk_arch_init(void)
Quoted 6 lines
arch/arm/mach-omap2/clock34xx.c +3
-1+omap3_dpll_recalc (&dpll2_ck); + } +recalculate_root_clocks (); - printk(KERN_INFO "Switched to new clocking rate(Crystal/DPLL3/MPU): "
arch/arm/mach-omap2/clock34xx.c static int __init omap2_clk_arch_init(void) · line 1136
Quoted 1 line
arch/arm/mach-omap2/clock34xx.c +1
-0+ printk(KERN_INFO "Switched to new clocking rate(Crystal/Core/MPU): "
arch/arm/mach-omap2/clock34xx.c static int __init omap2_clk_arch_init(void) · line 1099
Quoted 2 lines
arch/arm/mach-omap2/clock34xx.c +0
-1"%ld.%01ld/%ld/%ld MHz\n", - (osc_sys_ck.rate / 1000000), (osc_sys_ck.rate /100000) % 10,
arch/arm/mach-omap2/clock34xx.c static int __init omap2_clk_arch_init(void) · line 1138
Quoted 2 lines
arch/arm/mach-omap2/clock34xx.c +1
-1- (core_ck.rate / 1000000), (dpll1_fck.rate / 1000000)) ; + (osc_sys_ck.rate / 1000000), ((osc_sys_ck.rate /100000) % 10),
Quoted 10 lines
arch/arm/mach-omap2/clock34xx.c +6
-0+ (core_ck.rate / 1000000), (dpll1_ck.rate / 1000000)) ; + +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ; + +calibrate_delay ();return 0 ; }arch/arm/mach-omap2/clock34xx.c int __init omap2_clk_init(void) · line 1205
Quoted 7 lines
arch/arm/mach-omap2/clock34xx.c +1
-1@@ -1156,10 +1200,13 @@ int __init omap2_clk_init(void)recalculate_root_clocks (); - printk(KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): " + printk(KERN_INFO "Clocking rate (Crystal/DPLL/MPU core): " "%ld.%01ld/%ld/%ld MHz\n", (osc_sys_ck.rate / 1000000), (osc_sys_ck.rate /100000) % 10,
arch/arm/mach-omap2/clock34xx.c int __init omap2_clk_init(void) · line 1206
Quoted 2 lines
arch/arm/mach-omap2/clock34xx.c +1
-1- (core_ck.rate / 1000000), (arm_fck.rate / 1000000)); + (core_ck.rate / 1000000), (dpll1_ck.rate /1000000));
Quoted 11 lines
arch/arm/mach-omap2/clock34xx.c +3
-0+ +printk (KERN_INFO "IVA2 clocking rate: %ld MHz\n" , + (dpll2_ck.rate /1000000 )) ;/* * Only enable those clocks we will need, let the drivers Signature · 4 lines
1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribelinux-omap" in
Quoted 2 lines
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html