summaryrefslogtreecommitdiff
path: root/drivers/thermal/msm_thermal.c
diff options
context:
space:
mode:
authorRam Chandrasekar <rkumbako@codeaurora.org>2016-03-09 15:47:07 -0700
committerJeevan Shriram <jshriram@codeaurora.org>2016-05-05 15:05:51 -0700
commit07f3dcfc7f7c8452f3420f95de3f2222649e5a2f (patch)
treecd61be42f1c372b13e2361e0f4ddb983828bfe3d /drivers/thermal/msm_thermal.c
parent6e2d82b20125a46ed103540bf4fb67cd285b2f09 (diff)
msm: thermal: Prolong KTM mitigation till thermal-engine takesover
KTM stops the boot time mitigation during late init and thermal engine takes over the mitigation only after a delay. Modify KTM to prolong the boot time mitigation till thermal-engine sends a disable command. This ensures a safe handover. CRs-Fixed: 1007266 Change-Id: Icb876f16cac9471c523f3ef5b5fd3ede9d5d597c Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
Diffstat (limited to 'drivers/thermal/msm_thermal.c')
-rw-r--r--drivers/thermal/msm_thermal.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c
index ff6deec8144e..57ecdf4ace2f 100644
--- a/drivers/thermal/msm_thermal.c
+++ b/drivers/thermal/msm_thermal.c
@@ -171,7 +171,6 @@ static bool ocr_nodes_called;
static bool ocr_probed;
static bool ocr_reg_init_defer;
static bool hotplug_enabled;
-static bool interrupt_mode_enable;
static bool msm_thermal_probed;
static bool gfx_crit_phase_ctrl_enabled;
static bool gfx_warm_phase_ctrl_enabled;
@@ -4858,10 +4857,9 @@ static void __ref disable_msm_thermal(void)
static void interrupt_mode_init(void)
{
- if (!msm_thermal_probed) {
- interrupt_mode_enable = true;
+ if (!msm_thermal_probed)
return;
- }
+
if (polling_enabled) {
polling_enabled = 0;
create_sensor_zone_id_map();
@@ -7273,10 +7271,6 @@ static int msm_thermal_dev_probe(struct platform_device *pdev)
if (ret)
goto probe_exit;
msm_thermal_probed = true;
- if (interrupt_mode_enable) {
- interrupt_mode_init();
- interrupt_mode_enable = false;
- }
return ret;
fail:
@@ -7413,7 +7407,6 @@ int __init msm_thermal_late_init(void)
}
}
msm_thermal_add_mx_nodes();
- interrupt_mode_init();
create_cpu_topology_sysfs();
create_thermal_debugfs();
msm_thermal_add_bucket_info_nodes();