Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal fixes from Eduardo Valentin:
"Fixes for STM and HISI thermal drivers"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
thermal: stm32: Fix stm_thermal_read_factory_settings
thermal: stm32: read factory settings inside stm_thermal_prepare
thermal/drivers/hisi: Fix number of sensors on hi3660
thermal/drivers/hisi: Fix wrong platform_get_irq_byname()
+8
-8
+2
-2
drivers/thermal/hisi_thermal.c
+2
-2
drivers/thermal/hisi_thermal.c
···
424
424
struct platform_device *pdev = data->pdev;
425
425
struct device *dev = &pdev->dev;
426
426
427
-
data->nr_sensors = 2;
427
+
data->nr_sensors = 1;
428
428
429
429
data->sensor = devm_kzalloc(dev, sizeof(*data->sensor) *
430
430
data->nr_sensors, GFP_KERNEL);
···
589
589
return ret;
590
590
}
591
591
592
-
ret = platform_get_irq_byname(pdev, sensor->irq_name);
592
+
ret = platform_get_irq(pdev, 0);
593
593
if (ret < 0)
594
594
return ret;
595
595
+6
-6
drivers/thermal/st/stm_thermal.c
+6
-6
drivers/thermal/st/stm_thermal.c
···
241
241
sensor->t0 = TS1_T0_VAL1;
242
242
243
243
/* Retrieve fmt0 and put it on Hz */
244
-
sensor->fmt0 = ADJUST * readl_relaxed(sensor->base + DTS_T0VALR1_OFFSET)
245
-
& TS1_FMT0_MASK;
244
+
sensor->fmt0 = ADJUST * (readl_relaxed(sensor->base +
245
+
DTS_T0VALR1_OFFSET) & TS1_FMT0_MASK);
246
246
247
247
/* Retrieve ramp coefficient */
248
248
sensor->ramp_coeff = readl_relaxed(sensor->base + DTS_RAMPVALR_OFFSET) &
···
532
532
if (ret)
533
533
return ret;
534
534
535
+
ret = stm_thermal_read_factory_settings(sensor);
536
+
if (ret)
537
+
goto thermal_unprepare;
538
+
535
539
ret = stm_thermal_calibration(sensor);
536
540
if (ret)
537
541
goto thermal_unprepare;
···
639
635
640
636
/* Populate sensor */
641
637
sensor->base = base;
642
-
643
-
ret = stm_thermal_read_factory_settings(sensor);
644
-
if (ret)
645
-
return ret;
646
638
647
639
sensor->clk = devm_clk_get(&pdev->dev, "pclk");
648
640
if (IS_ERR(sensor->clk)) {