diff options
author | G, Manjunath Kondaiah <manjugk@ti.com> | 2010-12-01 11:01:19 +0530 |
---|---|---|
committer | G, Manjunath Kondaiah <manjugk@ti.com> | 2010-12-01 11:01:23 +0530 |
commit | d52c8fd46fab01283690976098bb27d7fca44481 (patch) | |
tree | 8c22cdc651dd1d0c7c0dd915d1ac92a9461db781 | |
parent | 463e3f2ef6c93c3180bd9017d8c0ce8e4548196f (diff) | |
parent | 3cba8a7dc744fa58eb56b7bdac4b399b311fc765 (diff) |
Merge remote branch 'audio_next' into L24.11 for p4 release
-rw-r--r-- | arch/arm/mach-omap2/opp44xx_data.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltage.c | 14 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/opp.h | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/voltage.h | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/omap_device.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/opp.c | 14 |
6 files changed, 11 insertions, 30 deletions
diff --git a/arch/arm/mach-omap2/opp44xx_data.c b/arch/arm/mach-omap2/opp44xx_data.c index 11567f8c501f..7fe524f7fed5 100644 --- a/arch/arm/mach-omap2/opp44xx_data.c +++ b/arch/arm/mach-omap2/opp44xx_data.c @@ -62,8 +62,6 @@ static struct omap_opp_def __initdata omap44xx_pre_es2_1_opp_def_list[] = { OMAP_OPP_DEF("dsp", true, 465600000, 1100000), /* DSP OPP3 - OPPTB */ OMAP_OPP_DEF("dsp", false, 498000000, 1260000), - /* ABE OPP1 - OPP25 */ - OMAP_OPP_DEF("omap-aess-audio", true, 49150000, 930000), /* ABE OPP1 - OPP50 */ OMAP_OPP_DEF("omap-aess-audio", true, 98300000, 930000), /* ABE OPP2 - OPP100 */ diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 2e14c474e47a..0489874cf312 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -1305,7 +1305,7 @@ static int scale_dep_vdd(struct omap_vdd_info *main_vdd) for (i = 0; i < main_vdd->nr_dep_vdd; i++) omap_voltage_scale(dep_vdds[i].voltdm, - dep_vdds[i].cur_dep_volt, 0); + dep_vdds[i].cur_dep_volt); return 0; } @@ -1793,8 +1793,7 @@ struct voltagedomain *omap_voltage_domain_get(char *name) * the voltage domain voltage to the new value. Returns 0 on success * else the error value. */ -int omap_voltage_scale(struct voltagedomain *voltdm, unsigned long volt, - unsigned long hack_freq) +int omap_voltage_scale(struct voltagedomain *voltdm, unsigned long volt) { unsigned long curr_volt; int is_volt_scaled = 0, i; @@ -1836,14 +1835,9 @@ int omap_voltage_scale(struct voltagedomain *voltdm, unsigned long volt, for (i = 0; i < vdd->dev_count; i++) { struct omap_opp *opp; - unsigned long freq = 0; + unsigned long freq; - if (!strcmp(dev_driver_string(vdd->dev_list[i]), "omap-aess-audio")) { - freq = hack_freq; - printk(KERN_ERR "hacking freq for aess -> %ld\n", freq); - } - - opp = opp_find_voltage(vdd->dev_list[i], volt, freq); + opp = opp_find_voltage(vdd->dev_list[i], volt); if (IS_ERR(opp)) { dev_err(vdd->dev_list[i], "%s: Unable to find OPP for" "volt%ld\n", __func__, volt); diff --git a/arch/arm/plat-omap/include/plat/opp.h b/arch/arm/plat-omap/include/plat/opp.h index 09beb8c252ed..de1e8662f2a5 100644 --- a/arch/arm/plat-omap/include/plat/opp.h +++ b/arch/arm/plat-omap/include/plat/opp.h @@ -77,8 +77,7 @@ struct omap_opp *opp_find_freq_floor(struct device *dev, unsigned long *freq); struct omap_opp *opp_find_freq_ceil(struct device *dev, unsigned long *freq); -struct omap_opp *opp_find_voltage(struct device *dev, unsigned long volt, - unsigned long hack_freq); +struct omap_opp *opp_find_voltage(struct device *dev, unsigned long volt); int opp_set_rate(struct device *dev, unsigned long freq); @@ -139,8 +138,7 @@ static inline struct omap_opp *opp_find_freq_ceil(struct device *dev, } static inline struct omap_opp *opp_find_voltage(struct device *dev, - unsigned long volt, - unsigned long hack_freq) + unsigned long volt) { return ERR_PTR(-EINVAL); } diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h index 19d67b2c3d83..563d5bae448d 100644 --- a/arch/arm/plat-omap/include/plat/voltage.h +++ b/arch/arm/plat-omap/include/plat/voltage.h @@ -151,8 +151,7 @@ void omap_voltage_register_pmic(struct omap_volt_pmic_info *pmic_info); unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm); int omap_voltage_add_userreq(struct voltagedomain *voltdm, struct device *dev, unsigned long *volt); -int omap_voltage_scale(struct voltagedomain *voltdm, unsigned long volt, - unsigned long hack_freq); +int omap_voltage_scale(struct voltagedomain *voltdm, unsigned long volt); #ifdef CONFIG_PM void omap_voltage_init_vc(struct omap_volt_vc_data *setup_vc); diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 690aee2fd398..3b4bfc3ede06 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -943,7 +943,7 @@ int omap_device_set_rate(struct device *req_dev, struct device *dev, } /* Do the actual scaling */ - return omap_voltage_scale(voltdm, volt, freq); + return omap_voltage_scale(voltdm, volt); } EXPORT_SYMBOL(omap_device_set_rate); diff --git a/arch/arm/plat-omap/opp.c b/arch/arm/plat-omap/opp.c index d0de2e412cbc..1e2e21bb48ff 100644 --- a/arch/arm/plat-omap/opp.c +++ b/arch/arm/plat-omap/opp.c @@ -329,8 +329,7 @@ struct omap_opp *opp_find_freq_floor(struct device *dev, unsigned long *freq) * opp if found, else returns ERR_PTR in case of error and should be handled * using IS_ERR. */ -struct omap_opp *opp_find_voltage(struct device *dev, unsigned long volt, - unsigned long hack_freq) +struct omap_opp *opp_find_voltage(struct device *dev, unsigned long volt) { struct device_opp *dev_opp; struct omap_opp *temp_opp, *opp = ERR_PTR(-ENODEV); @@ -341,15 +340,8 @@ struct omap_opp *opp_find_voltage(struct device *dev, unsigned long volt, list_for_each_entry(temp_opp, &dev_opp->opp_list, node) { if (temp_opp->enabled && temp_opp->u_volt == volt) { - if (hack_freq) { - if (hack_freq == temp_opp->rate) { - opp = temp_opp; - break; - } - } else { - opp = temp_opp; - break; - } + opp = temp_opp; + break; } } |