OMAP3:PM: introduce enabled flag to omap_opp
PATCH 1/1 OMAP3:PM: introduce enabled flag to omap_opp
We used to enable and disable OPPs based on rate being set to 0, this has been confusing in general. So, allow specific OPPs to be now enabled/disabled by an explicit enabled flag.
Recommendations from Kevin and Sanjeev contributed to this patch
Tested on: SDP3430
--- arch/arm/mach-omap2/pm34xx.c | 32 ++++++++++++++-------------- arch/arm/mach-omap2/resource34xx.c | 3 ++ arch/arm/plat-omap/include/mach/omap-pm.h | 2 + 3 files changed, 21 insertions(+), 16 deletions(-)
arch/arm/mach-omap2/pm34xx.c +16 -16
@@ -100,41 +100,41 @@ static struct prm_setup_vc prm_setup = { };struct omap_opp omap3_mpu_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S125M ,VDD1_OPP1 ,0x1E }, + {true,S125M ,VDD1_OPP1 ,0x1E , true},/*OPP2*/ - {S250M ,VDD1_OPP2 ,0x26 }, + {true,S250M ,VDD1_OPP2 ,0x26 },/*OPP3*/ - {S500M ,VDD1_OPP3 ,0x30 }, + {true,S500M ,VDD1_OPP3 ,0x30 },/*OPP4*/ - {S550M ,VDD1_OPP4 ,0x36 }, + {true,S550M ,VDD1_OPP4 ,0x36 },/*OPP5*/ - {S600M ,VDD1_OPP5 ,0x3C }, + {true,S600M ,VDD1_OPP5 ,0x3C }, };struct omap_opp omap3_l3_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {0 ,VDD2_OPP1 ,0x1E }, + {false,0 ,VDD2_OPP1 ,0x1E },/*OPP2*/ - {S83M ,VDD2_OPP2 ,0x24 }, + {true,S83M ,VDD2_OPP2 ,0x24 },/*OPP3*/ - {S166M ,VDD2_OPP3 ,0x2C }, + {true,S166M ,VDD2_OPP3 ,0x2C }, };struct omap_opp omap3_dsp_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S90M ,VDD1_OPP1 ,0x1E }, + {true,S90M ,VDD1_OPP1 ,0x1E },/*OPP2*/ - {S180M ,VDD1_OPP2 ,0x26 }, + {true,S180M ,VDD1_OPP2 ,0x26 },/*OPP3*/ - {S360M ,VDD1_OPP3 ,0x30 }, + {true,S360M ,VDD1_OPP3 ,0x30 },/*OPP4*/ - {S400M ,VDD1_OPP4 ,0x36 }, + {true,S400M ,VDD1_OPP4 ,0x36 },/*OPP5*/ - {S430M ,VDD1_OPP5 ,0x3C }, + {true,S430M ,VDD1_OPP5 ,0x3C }, };const struct omap_opp_table omap3_mpu_opp_table = {
arch/arm/mach-omap2/resource34xx.c +3 -0
@@ -282,6 +282,9 @@ static int program_opp(int res, struct omap_opp *opp, int target_level, t_opp =ID_VDD (res) |ID_OPP_NO (opp[target_level].opp_id); c_opp =ID_VDD (res) |ID_OPP_NO (opp[current_level].opp_id);#endif +/* only allow enabled OPPs */ +if (!opp[target_level].enabled) +return -EINVAL ;/* Sanity check of the OPP params before attempting to set */ if (!opp[target_level].rate || !opp[target_level].vsel)
arch/arm/plat-omap/include/mach/omap-pm.h +2 -0
@@ -21,6 +21,7 @@/** * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU +* @enabled: enabled if true, disabled if false * @rate: target clock rate * @opp_id: OPP ID * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP
@@ -28,6 +29,7 @@* Operating performance point data. Can vary by OMAP chip and board. */ struct omap_opp { +bool enabled;unsigned long rate;u8 opp_id;u16 vsel;
Signature · 1 line
1.6.0.4
Quoted 10 lines
-----Original Message-----
From: [email protected] [mailto:linux-omap- [email protected]] On Behalf Of Nishanth Menon
Sent: Friday, October 09, 2009 3:28 PM
To: linux-omap
Cc: Nishanth Menon; Kevin Hilman; Sanjeev Premi
Subject: [PATCH] OMAP3:PM: introduce enabled flag toomap_opp
Quoted 5 lines
We used to enable and disable OPPs based on
rate being set to 0, this has been confusing in
general. So, allow specific OPPs to be now
enabled/disabled by an explicit enabled flag.
A dumb question, what is the intention of this flag?
Quoted 20 lines
Recommendations from Kevin and Sanjeev contributed to this patch
Tested on: SDP3430
Signed-off-by Nishanth Menon <[email protected]>Cc Kevin Hilman <[email protected]>Cc Sanjeev Premi <[email protected]>--- arch/arm/mach-omap2/pm34xx.c | 32 ++++++++++++++---------- ---- arch/arm/mach-omap2/resource34xx.c | 3 ++ arch/arm/plat-omap/include/mach/omap-pm.h | 2 + 3 files changed, 21 insertions(+), 16 deletions(-)arch/arm/mach-omap2/pm34xx.c +0
-0
arch/arm/mach-omap2/pm34xx.c static struct prm_setup_vc prm_setup = { · line 105
Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +2
-2@@ -100,41 +100,41 @@ static struct prm_setup_vc prm_setup = { };struct omap_opp omap3_mpu_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S125M ,VDD1_OPP1 ,0x1E }, + {true,S125M ,VDD1_OPP1 ,0x1E , true},
Looks like you added an extra flag in this case?
Quoted 93 lines
arch/arm/mach-omap2/pm34xx.c +14
-14/*OPP2*/ - {S250M, VDD1_OPP2, 0x26}, + {true, S250M, VDD1_OPP2, 0x26},/*OPP3*/ - {S500M, VDD1_OPP3, 0x30}, + {true, S500M, VDD1_OPP3, 0x30},/*OPP4*/ - {S550M, VDD1_OPP4, 0x36}, + {true, S550M, VDD1_OPP4, 0x36},/*OPP5*/ - {S600M, VDD1_OPP5, 0x3C}, + {true, S600M, VDD1_OPP5, 0x3C}, };struct omap_opp omap3_l3_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {0 ,VDD2_OPP1 ,0x1E }, + {false,0 ,VDD2_OPP1 ,0x1E },/*OPP2*/ - {S83M ,VDD2_OPP2 ,0x24 }, + {true,S83M ,VDD2_OPP2 ,0x24 },/*OPP3*/ - {S166M ,VDD2_OPP3 ,0x2C }, + {true,S166M ,VDD2_OPP3 ,0x2C }, };struct omap_opp omap3_dsp_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S90M ,VDD1_OPP1 ,0x1E }, + {true,S90M ,VDD1_OPP1 ,0x1E },/*OPP2*/ - {S180M ,VDD1_OPP2 ,0x26 }, + {true,S180M ,VDD1_OPP2 ,0x26 },/*OPP3*/ - {S360M ,VDD1_OPP3 ,0x30 }, + {true,S360M ,VDD1_OPP3 ,0x30 },/*OPP4*/ - {S400M ,VDD1_OPP4 ,0x36 }, + {true,S400M ,VDD1_OPP4 ,0x36 },/*OPP5*/ - {S430M ,VDD1_OPP5 ,0x3C }, + {true,S430M ,VDD1_OPP5 ,0x3C }, }; const struct omap_opp_table omap3_mpu_opp_table = {arch/arm/mach- renamed from arch/arm/mach-omap2/resource34xx.c +0
-0
omap2/resource34xx.c
index 491e1dc..12de2c6 100644arch/arm/mach-omap2/resource34xx.c +3
-0@@ -282,6 +282,9 @@ static int program_opp(int res, struct omap_opp *opp,int target_level, t_opp =ID_VDD (res) |ID_OPP_NO (opp[target_level].opp_id); c_opp =ID_VDD (res) |ID_OPP_NO (opp[current_level].opp_id);#endif +/* only allow enabled OPPs */ +if (!opp[target_level].enabled) +return -EINVAL ;/* Sanity check of the OPP params before attempting to set */ arch/arm/mach-omap2/resource34xx.c +0
-0if (!opp[target_level].rate || !opp[target_level].vsel)arch/arm/plat- renamed from arch/arm/plat-omap/include/mach/omap-pm.h +0
-0
omap/include/mach/omap-pm.h
index 51216cf..33e1a3e 100644arch/arm/plat-omap/include/mach/omap-pm.h +2
-1@@ -21,6 +21,7 @@/** * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU +* @enabled: enabled if true, disabled if false * @rate: target clock rate * @opp_id: OPP ID * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP @@ -28,6 +29,7 @@* Operating performance point data. Can vary by OMAP chip and board. */ struct omap_opp { +bool enabled;unsigned long rate;u8 opp_id;u16 vsel; --1.6.0.4
--
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
Nishanth,
Just one minor bug below.
Quoted 34 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Menon, Nishanth
Sent: Friday, October 09, 2009 3:28 PM
To: linux-omap
Cc: Menon, Nishanth; Kevin Hilman; Premi, Sanjeev
Subject: [PATCH] OMAP3:PM: introduce enabled flag toomap_oppWe used to enable and disable OPPs based on
rate being set to 0, this has been confusing in
general. So, allow specific OPPs to be now
enabled/disabled by an explicit enabled flag.Recommendations from Kevin and Sanjeev contributed to this patch
Tested on: SDP3430
Signed-off-by Nishanth Menon <[email protected]>Cc Kevin Hilman <[email protected]>Cc Sanjeev Premi <[email protected]>--- arch/arm/mach-omap2/pm34xx.c | 32 ++++++++++++++-------------- arch/arm/mach-omap2/resource34xx.c | 3 ++ arch/arm/plat-omap/include/mach/omap-pm.h | 2 + 3 files changed, 21 insertions(+), 16 deletions(-)arch/arm/mach-omap2/pm34xx.c +0
-0
arch/arm/mach-omap2/pm34xx.c static struct prm_setup_vc prm_setup = { · line 105
Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +2
-2@@ -100,41 +100,41 @@ static struct prm_setup_vc prm_setup = { };struct omap_opp omap3_mpu_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S125M ,VDD1_OPP1 ,0x1E }, + {true,S125M ,VDD1_OPP1 ,0x1E , true},
The last "true" here is wrong.
Should just be:
{true, S125M, VDD1_OPP1, 0x1E},Regards,
Sergio
Quoted 97 lines
arch/arm/mach-omap2/pm34xx.c +14
-14/*OPP2*/ - {S250M, VDD1_OPP2, 0x26}, + {true, S250M, VDD1_OPP2, 0x26},/*OPP3*/ - {S500M, VDD1_OPP3, 0x30}, + {true, S500M, VDD1_OPP3, 0x30},/*OPP4*/ - {S550M, VDD1_OPP4, 0x36}, + {true, S550M, VDD1_OPP4, 0x36},/*OPP5*/ - {S600M, VDD1_OPP5, 0x3C}, + {true, S600M, VDD1_OPP5, 0x3C}, };struct omap_opp omap3_l3_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {0 ,VDD2_OPP1 ,0x1E }, + {false,0 ,VDD2_OPP1 ,0x1E },/*OPP2*/ - {S83M ,VDD2_OPP2 ,0x24 }, + {true,S83M ,VDD2_OPP2 ,0x24 },/*OPP3*/ - {S166M ,VDD2_OPP3 ,0x2C }, + {true,S166M ,VDD2_OPP3 ,0x2C }, };struct omap_opp omap3_dsp_rate_table[] = { - {0 ,0 ,0 }, + {0 ,0 ,0 ,0 },/*OPP1*/ - {S90M ,VDD1_OPP1 ,0x1E }, + {true,S90M ,VDD1_OPP1 ,0x1E },/*OPP2*/ - {S180M ,VDD1_OPP2 ,0x26 }, + {true,S180M ,VDD1_OPP2 ,0x26 },/*OPP3*/ - {S360M ,VDD1_OPP3 ,0x30 }, + {true,S360M ,VDD1_OPP3 ,0x30 },/*OPP4*/ - {S400M ,VDD1_OPP4 ,0x36 }, + {true,S400M ,VDD1_OPP4 ,0x36 },/*OPP5*/ - {S430M ,VDD1_OPP5 ,0x3C }, + {true,S430M ,VDD1_OPP5 ,0x3C }, }; const struct omap_opp_table omap3_mpu_opp_table = {arch/arm/mach-omap2/resource34xx.c +3
-0@@ -282,6 +282,9 @@ static int program_opp(int res, struct omap_opp *opp, int target_level, t_opp =ID_VDD (res) |ID_OPP_NO (opp[target_level].opp_id); c_opp =ID_VDD (res) |ID_OPP_NO (opp[current_level].opp_id);#endif +/* only allow enabled OPPs */ +if (!opp[target_level].enabled) +return -EINVAL ;/* Sanity check of the OPP params before attempting to set */ arch/arm/mach-omap2/resource34xx.c +0
-0if (!opp[target_level].rate || !opp[target_level].vsel)arch/arm/plat-omap/include/mach/omap-pm.h +1
-0@@ -21,6 +21,7 @@/** * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU +* @enabled: enabled if true, disabled if false * @rate: target clock rate * @opp_id: OPP ID * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP @@ -28,6 +29,7 @@* Operating performance point data. Can vary by OMAP chip and board.
*/
structomap_opp{arch/arm/plat-omap/include/mach/omap-pm.h +1
-0+bool enabled;unsigned long rate;u8 opp_id;u16 vsel;Signature · 7 lines
1.6.0.4 -- 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
Madhu, Sergio,
Aguirre Rodriguez, Sergio Alberto had written, on 10/09/2009 04:17 PM, the following:
Quoted 7 lines
arch/arm/mach-omap2/pm34xx.c static struct prm_setup_vc prm_setup = { · line 105
Quoted 2 lines
arch/arm/mach-omap2/pm34xx.c +1
-1- {S125M, VDD1_OPP1, 0x1E}, + {true, S125M, VDD1_OPP1, 0x1E, true},The last "true" here is wrong.
Should just be:
{true, S125M, VDD1_OPP1, 0x1E},
thanks.. that is thanks to my hasty patch hand edition... apologies on the noise. :( I will send out a v2.
Madhu,
Quoted 8 lines
Quoted 5 lines
We used to enable and disable OPPs based on rate being set to 0, this has been confusing in general. So, allow specific OPPs to be now enabled/disabled by an explicit enabled flag.
A dumb question, what is the intention of this flag?
the idea was to allow a field to properly disable the OPP instead of reusing rate flag itself.
Signature · 2 lines
Regards, Nishanth Menon