SmartReflex implements a get_opp to search through the opp table, replace it opp_is_valid to verify the OPPs and getting the opp_id.
NOTE: usage of opp_id is deprecated and this introduces the following warnings: arch/arm/mach-omap2/smartreflex.c: In function 'get_vdd1_opp': arch/arm/mach-omap2/smartreflex.c:161: warning: 'opp_id' is deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) arch/arm/mach-omap2/smartreflex.c: In function 'get_vdd2_opp': arch/arm/mach-omap2/smartreflex.c:176: warning: 'opp_id' is deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) Cc: Benoit Cousson <[email protected]> Cc: Eduardo Valentin <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Madhusudhan Chikkature Rajashekar <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Romit Dasgupta <[email protected]> Cc: Sanjeev Premi <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: Sergio Alberto Aguirre Rodriguez <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Thara Gopinath <[email protected]> Cc: Vishwanath Sripathy <[email protected]> Signed-off-by: Nishanth Menon <[email protected]> --- arch/arm/mach-omap2/smartreflex.c | 44 +++++++++++------------------------- 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index be3a1da..ccc98a0 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -146,50 +146,34 @@ static u32 cal_test_nvalue(u32 sennval, u32 senpval) (rnsenn << NVALUERECIPROCAL_RNSENN_SHIFT); } -/* determine the current OPP from the frequency - * we need to give this function last element of OPP rate table - * and the frequency - */ -static u16 get_opp(struct omap_opp *opp_freq_table, - unsigned long freq) -{ - struct omap_opp *prcm_config; - - prcm_config = opp_freq_table; - - if (prcm_config->rate <= freq) - return prcm_config->opp_id; /* Return the Highest OPP */ - for (; prcm_config->rate; prcm_config--) - if (prcm_config->rate < freq) - return (prcm_config+1)->opp_id; - else if (prcm_config->rate == freq) - return prcm_config->opp_id; - /* Return the least OPP */ - return (prcm_config+1)->opp_id; -} - -static u16 get_vdd1_opp(void) +static u8 get_vdd1_opp(void) { - u16 opp; + struct omap_opp *opp; if (sr1.vdd_opp_clk == NULL || IS_ERR(sr1.vdd_opp_clk) || mpu_opps == NULL) return 0; - opp = get_opp(mpu_opps + MAX_VDD1_OPP, sr1.vdd_opp_clk->rate); - return opp; + opp = opp_find_freq_exact(mpu_opps, sr1.vdd_opp_clk->rate, true); + if (IS_ERR(opp)) + return 0; + + return opp->opp_id; } -static u16 get_vdd2_opp(void) +static u8 get_vdd2_opp(void) { - u16 opp; + struct omap_opp *opp; if (sr2.vdd_opp_clk == NULL || IS_ERR(sr2.vdd_opp_clk) || l3_opps == NULL) return 0; - opp = get_opp(l3_opps + MAX_VDD2_OPP, sr2.vdd_opp_clk->rate); - return opp; + opp = opp_find_freq_exact(l3_opps, sr2.vdd_opp_clk->rate, true); + if (IS_ERR(opp)) + return 0; + + return opp->opp_id; } -- 1.6.3.3 -- 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
