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

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

Merge "thermal: qpnp-adc-tm: Keep VADC_TM peripheral always enabled"

parents af4ea937 cb813fd5

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -488,8 +488,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -503,8 +503,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -518,8 +518,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -533,8 +533,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -490,8 +490,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -505,8 +505,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -520,8 +520,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};
@@ -535,8 +535,8 @@ 


		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				temperature = <125000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

drivers/thermal/qpnp-adc-tm.c

+2 −17
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -256,22 +256,7 @@ static int32_t qpnp_adc_tm_enable(struct qpnp_adc_tm_chip *chip) 


static int32_t qpnp_adc_tm_disable(struct qpnp_adc_tm_chip *chip)

{

	u8 data = 0;

	int rc = 0;



	rc = qpnp_adc_tm_write_reg(chip, QPNP_BTM_CONV_REQ, data, 1);

	if (rc < 0) {

		pr_err("adc-tm enable failed\n");

		return rc;

	}



	rc = qpnp_adc_tm_write_reg(chip, QPNP_EN_CTL1, data, 1);

	if (rc < 0) {

		pr_err("adc-tm disable failed\n");

		return rc;

	}



	return rc;

	return 0;

}



static int qpnp_adc_tm_is_valid(struct qpnp_adc_tm_chip *chip)