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

Commit 76a5cfb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents e10db791 99c47fcd

drivers/thermal/hisi_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data) 
	struct platform_device *pdev = data->pdev;

	struct device *dev = &pdev->dev;



	data->nr_sensors = 2;

	data->nr_sensors = 1;



	data->sensor = devm_kzalloc(dev, sizeof(*data->sensor) *

				    data->nr_sensors, GFP_KERNEL);
@@ -589,7 +589,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
			return ret;

		}



		ret = platform_get_irq_byname(pdev, sensor->irq_name);

		ret = platform_get_irq(pdev, 0);

		if (ret < 0)

			return ret;

drivers/thermal/st/stm_thermal.c

+6 −6
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ static int stm_thermal_read_factory_settings(struct stm_thermal_sensor *sensor) 
		sensor->t0 = TS1_T0_VAL1;



	/* Retrieve fmt0 and put it on Hz */

	sensor->fmt0 = ADJUST * readl_relaxed(sensor->base + DTS_T0VALR1_OFFSET)

					      & TS1_FMT0_MASK;

	sensor->fmt0 = ADJUST * (readl_relaxed(sensor->base +

				 DTS_T0VALR1_OFFSET) & TS1_FMT0_MASK);



	/* Retrieve ramp coefficient */

	sensor->ramp_coeff = readl_relaxed(sensor->base + DTS_RAMPVALR_OFFSET) &
@@ -532,6 +532,10 @@ static int stm_thermal_prepare(struct stm_thermal_sensor *sensor) 
	if (ret)

		return ret;



	ret = stm_thermal_read_factory_settings(sensor);

	if (ret)

		goto thermal_unprepare;



	ret = stm_thermal_calibration(sensor);

	if (ret)

		goto thermal_unprepare;
@@ -636,10 +640,6 @@ static int stm_thermal_probe(struct platform_device *pdev) 
	/* Populate sensor */

	sensor->base = base;



	ret = stm_thermal_read_factory_settings(sensor);

	if (ret)

		return ret;



	sensor->clk = devm_clk_get(&pdev->dev, "pclk");

	if (IS_ERR(sensor->clk)) {

		dev_err(&pdev->dev, "%s: failed to fetch PCLK clock\n",