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

Commit 45021012 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: Initialize KTM interrupt mode at kernel late init level"

parents 9896df09 255ce53e

drivers/thermal/msm_thermal.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ static bool ocr_nodes_called; 
static bool ocr_probed;

static bool ocr_probed;

static bool ocr_reg_init_defer;

static bool ocr_reg_init_defer;

static bool hotplug_enabled;

static bool hotplug_enabled;

static bool interrupt_mode_enable;

static bool msm_thermal_probed;

static bool msm_thermal_probed;

static bool gfx_crit_phase_ctrl_enabled;

static bool gfx_crit_phase_ctrl_enabled;

static bool gfx_warm_phase_ctrl_enabled;

static bool gfx_warm_phase_ctrl_enabled;
@@ -4929,9 +4930,10 @@ static void __ref disable_msm_thermal(void) 




static void interrupt_mode_init(void)

static void interrupt_mode_init(void)

{

{

	if (!msm_thermal_probed)

	if (!msm_thermal_probed) {

		interrupt_mode_enable = true;

		return;

		return;



	}

	if (polling_enabled) {

	if (polling_enabled) {

		polling_enabled = 0;

		polling_enabled = 0;

		create_sensor_zone_id_map();

		create_sensor_zone_id_map();
@@ -7455,6 +7457,10 @@ static int msm_thermal_dev_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		goto probe_exit;

		goto probe_exit;

	msm_thermal_probed = true;

	msm_thermal_probed = true;

	if (interrupt_mode_enable) {

		interrupt_mode_init();

		interrupt_mode_enable = false;

	}





probe_exit:

probe_exit:

	return ret;

	return ret;
@@ -7591,6 +7597,7 @@ int __init msm_thermal_late_init(void) 
		}

		}

	}

	}

	msm_thermal_add_mx_nodes();

	msm_thermal_add_mx_nodes();

	interrupt_mode_init();

	create_cpu_topology_sysfs();

	create_cpu_topology_sysfs();

	create_thermal_debugfs();

	create_thermal_debugfs();

	msm_thermal_add_bucket_info_nodes();

	msm_thermal_add_bucket_info_nodes();