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

Commit 0947066f 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: update the virtual sensor name"

parents b86cb145 debcd41d

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

+8 −8
Original line number Diff line number Diff line
@@ -3261,10 +3261,10 @@ 
			};

		};



		silver-virt-max-usr {

			polling-delay-passive = <100>;

			polling-delay = <100>;

			thermal-governor = "user_space";

		silv-virt-max-step {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "step_wise";

			trips {

				silver-trip {

					temperature = <120000>;
@@ -3274,10 +3274,10 @@ 
			};

		};



		gold-virt-max-usr {

			polling-delay-passive = <100>;

			polling-delay = <100>;

			thermal-governor = "user_space";

		gold-virt-max-step {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "step_wise";

			trips {

				gold-trip {

					temperature = <120000>;

drivers/thermal/qcom/qti_virtual_sensor.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static const struct virtual_sensor_data qti_virtual_sensors[] = { 
		.logic = VIRT_MAXIMUM,

	},

	{

		.virt_zone_name = "silver-virt-max-usr",

		.virt_zone_name = "silv-virt-max-step",

		.num_sensors = 4,

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

				"cpu1-silver-usr",
@@ -38,7 +38,7 @@ static const struct virtual_sensor_data qti_virtual_sensors[] = { 
		.logic = VIRT_MAXIMUM,

	},

	{

		.virt_zone_name = "gold-virt-max-usr",

		.virt_zone_name = "gold-virt-max-step",

		.num_sensors = 4,

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

				"cpu1-gold-usr",

drivers/thermal/thermal_core.c

+4 −3
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) 
		thermal_zone_device_set_polling(thermal_passive_wq,

						tz, tz->passive_delay);

	else if (tz->polling_delay)

		thermal_zone_device_set_polling(system_freezable_wq,

		thermal_zone_device_set_polling(

				system_freezable_power_efficient_wq,

				tz, tz->polling_delay);

	else

		thermal_zone_device_set_polling(NULL, tz, 0);
@@ -2134,7 +2135,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, 
	/* Bind cooling devices for this zone */

	bind_tz(tz);



	INIT_DELAYED_WORK(&(tz->poll_queue), thermal_zone_device_check);

	INIT_DEFERRABLE_WORK(&(tz->poll_queue), thermal_zone_device_check);



	thermal_zone_device_reset(tz);

	/* Update the new thermal zone and mark it as already updated. */