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

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

Merge "defconfig: Update thermal drivers for SDM670 for arm mode"

parents 5ec64094 b9848222

arch/arm/configs/sdm670-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -330,6 +330,10 @@ CONFIG_THERMAL_QPNP_ADC_TM=y 
CONFIG_THERMAL_TSENS=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_AOP_REG_COOLING_DEVICE=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SYSCON=y

arch/arm/configs/sdm670_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -339,6 +339,10 @@ CONFIG_THERMAL_QPNP_ADC_TM=y 
CONFIG_THERMAL_TSENS=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_AOP_REG_COOLING_DEVICE=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SYSCON=y

arch/arm64/boot/dts/qcom/qcs605-lc.dtsi

+5 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2018-2019, 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
@@ -128,6 +128,10 @@ 
			/delete-node/ skin_cpu5;

		};

	};



	xo-therm-605-step {

		status = "disabled";

	};

};



&spmi_bus {

arch/arm64/boot/dts/qcom/qcs605.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -125,6 +125,22 @@ 
			};

		};

	};



	pop-mem-step {

		status = "disabled";

	};



	xo-therm-step {

		status = "disabled";

	};



	xo-therm-605-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-sensors = <&pm660_adc_tm 0x4c>;

		thermal-governor = "step_wise";

		status = "ok";

	};

};



&msm_gpu {

arch/arm64/boot/dts/qcom/sdm670-pmic-overlay.dtsi

+44 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, 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
@@ -432,4 +432,47 @@ 
			};

		};

	};



	xo-therm-605-step {

		trips {

			qcs605_batt_trip1: qcs605-batt-trip1 {

				temperature = <42000>;

				hysteresis = <4000>;

				type = "passive";

			};

			qcs605_batt_trip2: qcs605-batt-trip2 {

				temperature = <44000>;

				hysteresis = <2000>;

				type = "passive";

			};

			qcs605_batt_trip3: qcs605-batt-trip3 {

				temperature = <46000>;

				hysteresis = <2000>;

				type = "passive";

			};

			qcs605_batt_trip4: qcs605-batt-trip4 {

				temperature = <48000>;

				hysteresis = <2000>;

				type = "passive";

			};

		};

		cooling-maps {

			battery_lvl1 {

				trip = <&qcs605_batt_trip1>;

				cooling-device = <&pm660_charger 1 1>;

			};

			battery_lvl2 {

				trip = <&qcs605_batt_trip2>;

				cooling-device = <&pm660_charger 2 2>;

			};

			battery_lvl3 {

				trip = <&qcs605_batt_trip3>;

				cooling-device = <&pm660_charger 3 3>;

			};

			battery_lvl4 {

				trip = <&qcs605_batt_trip4>;

				cooling-device = <&pm660_charger 4 4>;

			};

		};

	};

};