Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d8f33f5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: thermal: Prolong KTM mitigation till thermal-engine takesover"

parents 7b4f4cc8 8272eda2

drivers/thermal/msm_thermal.c

+2 −10
Original line number Diff line number Diff line
@@ -159,7 +159,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;
@@ -4675,10 +4674,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();
@@ -7088,11 +7086,6 @@ static int msm_thermal_dev_probe(struct platform_device *pdev) 
	ret = msm_thermal_init(&data);

	msm_thermal_probed = true;



	if (interrupt_mode_enable) {

		interrupt_mode_init();

		interrupt_mode_enable = false;

	}



	return ret;

fail:

	if (ret)
@@ -7228,7 +7221,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();