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

Commit 2d7c4e17 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'fixes' and 'thermal-intel' into next

parents fb4d83f2 e925b5be

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+17 −4
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ enum int3400_thermal_uuid { 
	INT3400_THERMAL_PASSIVE_1,

	INT3400_THERMAL_ACTIVE,

	INT3400_THERMAL_CRITICAL,

	INT3400_THERMAL_ADAPTIVE_PERFORMANCE,

	INT3400_THERMAL_EMERGENCY_CALL_MODE,

	INT3400_THERMAL_PASSIVE_2,

	INT3400_THERMAL_POWER_BOSS,

	INT3400_THERMAL_VIRTUAL_SENSOR,

	INT3400_THERMAL_COOLING_MODE,

	INT3400_THERMAL_HARDWARE_DUTY_CYCLING,

	INT3400_THERMAL_MAXIMUM_UUID,

};
@@ -29,6 +36,13 @@ static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { 
	"42A441D6-AE6A-462b-A84B-4A8CE79027D3",

	"3A95C389-E4B8-4629-A526-C52C88626BAE",

	"97C68AE7-15FA-499c-B8C9-5DA81D606E0A",

	"63BE270F-1C11-48FD-A6F7-3AF253FF3E2D",

	"5349962F-71E6-431D-9AE8-0A635B710AEE",

	"9E04115A-AE87-4D1C-9500-0F3E340BFE75",

	"F5A35014-C209-46A4-993A-EB56DE7530A1",

	"6ED722A7-9240-48A5-B479-31EEF723D7CF",

	"16CAF1B7-DD38-40ED-B1C1-1B8A1913D531",

	"BE84BABF-C4D4-403D-B495-3128FD44dAC1",

};



struct int3400_thermal_priv {
@@ -299,10 +313,9 @@ static int int3400_thermal_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, priv);



	if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {

	int3400_thermal_ops.get_mode = int3400_thermal_get_mode;

	int3400_thermal_ops.set_mode = int3400_thermal_set_mode;

	}



	priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,

						priv, &int3400_thermal_ops,

						&int3400_thermal_params, 0, 0);

drivers/thermal/intel/intel_powerclamp.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static void start_power_clamp_worker(unsigned long cpu) 
	struct powerclamp_worker_data *w_data = per_cpu_ptr(worker_data, cpu);

	struct kthread_worker *worker;



	worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inject/%ld", cpu);

	worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inj/%ld", cpu);

	if (IS_ERR(worker))

		return;