Merge ~chunsang/avila/+git/kernel-3.10:power_consumption/fix-bt-thermal into ~phablet-team/avila/+git/kernel-3.10:ubuntu

Proposed by Chunsang Jeong on 2016-04-27
Status: Needs review
Proposed branch: ~chunsang/avila/+git/kernel-3.10:power_consumption/fix-bt-thermal
Merge into: ~phablet-team/avila/+git/kernel-3.10:ubuntu
Diff against target: 21 lines (+2/-2)
1 file modified
drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c (+2/-2)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato 2016-04-27 Pending
Ubuntu Phablet Team 2016-04-27 Pending
Review via email: mp+293054@code.launchpad.net

Description of the change

Fix bt thermal polling watermark which previously had wrong value to check
bt thermal for ever and thus invoked unnecessary kworker even while sleeping.

To post a comment you must log in.

Unmerged commits

53c6533... by Chunsang Jeong on 2016-04-26

Fix bt thermal polling watermark which previously had wrong value to check
bt thermal for ever and thus invoked unnecessary kworker even while sleeping.

Signed-off-by: Chunsang Jeong <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c b/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
index f7149e2..d69342e 100644
--- a/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
+++ b/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
@@ -23,7 +23,7 @@ extern struct proc_dir_entry * mtk_thermal_get_proc_drv_therm_dir_entry(void);
23static unsigned int interval = 0; /* seconds, 0 : no auto polling */23static unsigned int interval = 0; /* seconds, 0 : no auto polling */
24static int trip_temp[10] = {120000,110000,100000,90000,80000,70000,65000,60000,55000,50000};24static int trip_temp[10] = {120000,110000,100000,90000,80000,70000,65000,60000,55000,50000};
25static struct thermal_zone_device *thz_dev;25static struct thermal_zone_device *thz_dev;
26static int mtkts_bts_debug_log = 1;26static int mtkts_bts_debug_log = 0;
27static int kernelmode = 0;27static int kernelmode = 0;
28static int g_THERMAL_TRIP[10] = {0,0,0,0,0,0,0,0,0,0};28static int g_THERMAL_TRIP[10] = {0,0,0,0,0,0,0,0,0,0};
29static int num_trip=0;29static int num_trip=0;
@@ -553,7 +553,7 @@ int mtkts_bts_get_hw_temp(void)
553 //get HW AP temp (TSAP)553 //get HW AP temp (TSAP)
554 //cat /sys/class/power_supply/AP/AP_temp554 //cat /sys/class/power_supply/AP/AP_temp
555 t_ret = get_hw_bts_temp();555 t_ret = get_hw_bts_temp();
556 t_ret = t_ret * 1000;556 t_ret = t_ret * 100;
557557
558 mutex_unlock(&BTS_lock);558 mutex_unlock(&BTS_lock);
559559

Subscribers

People subscribed via source and target branches