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

Commit 315498d4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: bcl_soc: Skip thermal evaluation during zone register"

parents f96aec11 db807a5d

drivers/soc/qcom/cdsprm.c

+6 −0
Original line number Diff line number Diff line
@@ -850,6 +850,9 @@ static int cdsp_get_cur_state(struct thermal_cooling_device *cdev, 
static int cdsp_set_cur_state(struct thermal_cooling_device *cdev,

				unsigned long state)

{

	if (state > CDSP_THERMAL_MAX_STATE)

		return -EINVAL;



	if (gcdsprm.thermal_cdsp_level == state)

		return 0;
@@ -883,6 +886,9 @@ static int hvx_get_cur_state(struct thermal_cooling_device *cdev, 
static int hvx_set_cur_state(struct thermal_cooling_device *cdev,

				unsigned long state)

{

	if (state > HVX_THERMAL_MAX_STATE)

		return -EINVAL;



	if (gcdsprm.thermal_hvx_level == state)

		return 0;

drivers/thermal/qcom/bcl_soc.c

+4 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
@@ -81,6 +81,9 @@ static void bcl_evaluate_soc(struct work_struct *work) 
{

	int battery_percentage;



	if (!bcl_perph->tz_dev)

		return;



	if (bcl_read_soc(NULL, &battery_percentage))

		return;

drivers/thermal/qcom/cpu_isolate.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int cpu_isolate_set_cur_state(struct thermal_cooling_device *cdev, 


	/* Request state should be less than max_level */

	if (state > CPU_ISOLATE_LEVEL)

		state = CPU_ISOLATE_LEVEL;

		return -EINVAL;



	state = !!state;

	/* Check if the old cooling action is same as new cooling action */

drivers/thermal/qcom/cx_ipeak_cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int cxip_lm_set_cur_state(struct thermal_cooling_device *cdev, 
	int ret = 0;



	if (state > CXIP_LM_CDEV_MAX_STATE)

		state = CXIP_LM_CDEV_MAX_STATE;

		return -EINVAL;



	if (cxip_dev->state == state)

		return 0;

drivers/thermal/qcom/lmh_cpu_vdd_cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int lmh_cpu_vdd_set_cur_state(struct thermal_cooling_device *cdev, 
	struct lmh_cpu_vdd_cdev *vdd_cdev = cdev->devdata;



	if (state > LMH_CPU_VDD_MAX_LVL)

		state = LMH_CPU_VDD_MAX_LVL;

		return -EINVAL;



	state = !!state;

	/* Check if the old cooling action is same as new cooling action */