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

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

Merge "drivers: thermal: virtual-sensor: Add new virtual sensor for MSM8917"

parents 16f5fb7c 04cacf42

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

+6 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		};

	};



	mdss-usr {

	q6-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";
@@ -69,7 +69,7 @@ 
		};

	};



	cpuss-0-usr {

	cpuss-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 4>;
@@ -83,7 +83,7 @@ 
		};

	};



	apc1-cpu1-usr {

	apc1-cpu0-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 5>;
@@ -97,7 +97,7 @@ 
		};

	};



	apc1-cpu2-usr {

	apc1-cpu1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 6>;
@@ -111,7 +111,7 @@ 
		};

	};



	apc1-cpu3-usr {

	apc1-cpu2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 7>;
@@ -125,7 +125,7 @@ 
		};

	};



	apc1-cpu4-usr {

	apc1-cpu3-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 8>;

arch/arm64/boot/dts/qcom/qm215-regulator.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ 
			qcom,use-voltage-floor-level;

			qcom,always-send-voltage;

		};



		pm8916_cx_cdev: regulator-cx-cdev {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&pm8916_s1_floor_level>;

			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NOM_PLUS

					RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			#cooling-cells = <2>;

		};

	};



	rpm-regulator-smpa3 {

drivers/thermal/qcom/qti_virtual_sensor.c

+10 −0
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ static const struct virtual_sensor_data qti_virtual_sensors[] = { 
				"cpuss1-usr"},

		.logic = VIRT_MAXIMUM,

	},

	{

		.virt_zone_name = "penta-cpu-max-step",

		.num_sensors = 5,

		.sensor_names = {"apc1-cpu0-usr",

				"apc1-cpu1-usr",

				"apc1-cpu2-usr",

				"apc1-cpu3-usr",

				"cpuss-usr"},

		.logic = VIRT_MAXIMUM,

	},

};



int qti_virtual_sensor_register(struct device *dev)