diff options
| author | Andy Green <andy.green@linaro.org> | 2011-11-18 16:04:32 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-11-19 08:55:08 +0800 |
| commit | a7500c2797699ae8492dc52550825af6d769e79b (patch) | |
| tree | 42c424fd6dd7c19067ec1c6510d6244698a7caf1 | |
| parent | fc6f4b3302a12948fd6261f20518fbce0fc218c9 (diff) | |
quench thermal debuglinux-release-2011-11-1
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/dpll44xx.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap2plus-cpufreq.c | 8 | ||||
| -rw-r--r-- | drivers/staging/thermal_framework/governor/omap_die_governor.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c index 8838463318c..9042c8cfc3c 100644 --- a/arch/arm/mach-omap2/dpll44xx.c +++ b/arch/arm/mach-omap2/dpll44xx.c @@ -152,8 +152,8 @@ int omap4460_mpu_dpll_set_rate(struct clk *clk, unsigned long rate) if (v & OMAP4460_DCC_EN_MASK) dpll_rate *= 2; - pr_err("omap4460_mpu_dpll_set_rate: old rate %ld, new rate %ld\n", - dpll_rate, rate); +// pr_err("omap4460_mpu_dpll_set_rate: old rate %ld, new rate %ld\n", +// dpll_rate, rate); if (rate < OMAP_1GHz) { omap4460_dcc(clk, rate); diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c index 7dcba77ea82..10b3232cdd1 100644 --- a/arch/arm/mach-omap2/omap2plus-cpufreq.c +++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c @@ -280,7 +280,7 @@ void omap_thermal_step_freq_down(void) max_thermal = omap_thermal_lower_speed(); - pr_err("%s: temperature too high, starting cpu throttling at max %u\n", + pr_info("%s: temperature too high, starting cpu throttling at max %u\n", __func__, max_thermal); cur = omap_getspeed(0); @@ -297,7 +297,7 @@ void omap_thermal_step_freq_up(void) mutex_lock(&omap_cpufreq_lock); max_thermal = max_freq; - pr_err("%s: temperature reduced, stepping up to %i\n", + pr_info("%s: temperature reduced, stepping up to %i\n", __func__, current_target_freq); if (current_target_freq) { @@ -319,11 +319,11 @@ void omap_thermal_step_freq_up(void) static int cpufreq_apply_cooling(struct thermal_dev *dev, int cooling_level) { if (cooling_level < current_cooling_level) { - pr_err("%s: Unthrottle cool level %i curr cool %i\n", + pr_info("%s: Unthrottle cool level %i curr cool %i\n", __func__, cooling_level, current_cooling_level); omap_thermal_step_freq_up(); } else if (cooling_level > current_cooling_level) { - pr_err("%s: Throttle cool level %i curr cool %i\n", + pr_info("%s: Throttle cool level %i curr cool %i\n", __func__, cooling_level, current_cooling_level); omap_thermal_step_freq_down(); } diff --git a/drivers/staging/thermal_framework/governor/omap_die_governor.c b/drivers/staging/thermal_framework/governor/omap_die_governor.c index 12df6facc37..8d95a48cd0f 100644 --- a/drivers/staging/thermal_framework/governor/omap_die_governor.c +++ b/drivers/staging/thermal_framework/governor/omap_die_governor.c @@ -406,7 +406,7 @@ static int omap_process_cpu_temp(struct list_head *cooling_list, struct thermal_dev *temp_sensor, int temp) { - pr_err("%s: Received temp %i\n", __func__, temp); + pr_debug("%s: Received temp %i\n", __func__, temp); omap_gov->temp_sensor = temp_sensor; return omap_cpu_thermal_manager(cooling_list, temp); } |