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

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

Merge changes I5fe8718d,I577a850d,Ia837798e,I93e1b0cc into msm-4.14 

* changes:
  ARM: dts: msm: Add thermal zone definition for SDM855
  ARM: dts: msm: Add QMI cooling device for SDM855
  drivers: thermal: qmi-cooling: Update compatible name format
  defconfig: msm: Enable QMI Cooling devices for SDM855
parents 9f9688df 6e5abe67

Documentation/devicetree/bindings/thermal/qti-qmi-cdev.txt

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Properties: 
- compatible:

	Usage: required

	Value type: <string>

	Definition: should be "qcom,qmi_cooling_devices"

	Definition: should be "qcom,qmi-cooling-devices"





Subsystem properties:
@@ -52,7 +52,7 @@ Subsystem properties: 
Example:



	qmi-tmd-devices {

		compatible = "qcom,qmi_cooling_devices";

		compatible = "qcom,qmi-cooling-devices";



		modem {

			qcom,instance-id = <0x0>;

arch/arm64/boot/dts/qcom/sdm855-thermal.dtsi

+1697 −0

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ CONFIG_THERMAL_TSENS=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_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ CONFIG_THERMAL_TSENS=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_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

drivers/thermal/qcom/qmi_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static int qmi_device_remove(struct platform_device *pdev) 
}



static const struct of_device_id qmi_device_match[] = {

	{.compatible = "qcom,qmi_cooling_devices"},

	{.compatible = "qcom,qmi-cooling-devices"},

	{}

};