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

Commit 3f16503b 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:
 "Minor fixes to OF thermal, qoriq, and rcar drivers"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: of-thermal: disable passive polling when thermal zone is disabled
  thermal: rcar_gen3_thermal: convert to SPDX identifiers
  thermal: rcar_thermal: convert to SPDX identifiers
  thermal: qoriq: Switch to SPDX identifier
  thermal: qoriq: Simplify the 'site' variable assignment
  thermal: qoriq: Use devm_thermal_zone_of_sensor_register()
parents 050cdc6c 152395fd

drivers/thermal/of-thermal.c

+5 −2
Original line number Diff line number Diff line
@@ -260,10 +260,13 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, 


	mutex_lock(&tz->lock);



	if (mode == THERMAL_DEVICE_ENABLED)

	if (mode == THERMAL_DEVICE_ENABLED) {

		tz->polling_delay = data->polling_delay;

	else

		tz->passive_delay = data->passive_delay;

	} else {

		tz->polling_delay = 0;

		tz->passive_delay = 0;

	}



	mutex_unlock(&tz->lock);

drivers/thermal/qoriq_thermal.c

+8 −19
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 */

// SPDX-License-Identifier: GPL-2.0

//

// Copyright 2016 Freescale Semiconductor, Inc.



#include <linux/module.h>

#include <linux/platform_device.h>
@@ -197,7 +187,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev) 
	int ret;

	struct qoriq_tmu_data *data;

	struct device_node *np = pdev->dev.of_node;

	u32 site = 0;

	u32 site;



	if (!np) {

		dev_err(&pdev->dev, "Device OF-Node is NULL");
@@ -233,7 +223,8 @@ static int qoriq_tmu_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto err_tmu;



	data->tz = thermal_zone_of_sensor_register(&pdev->dev, data->sensor_id,

	data->tz = devm_thermal_zone_of_sensor_register(&pdev->dev,

							data->sensor_id,

							data, &tmu_tz_ops);

	if (IS_ERR(data->tz)) {

		ret = PTR_ERR(data->tz);
@@ -243,7 +234,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev) 
	}



	/* Enable monitoring */

	site |= 0x1 << (15 - data->sensor_id);

	site = 0x1 << (15 - data->sensor_id);

	tmu_write(data, site | TMR_ME | TMR_ALPF, &data->regs->tmr);



	return 0;
@@ -261,8 +252,6 @@ static int qoriq_tmu_remove(struct platform_device *pdev) 
{

	struct qoriq_tmu_data *data = platform_get_drvdata(pdev);



	thermal_zone_of_sensor_unregister(&pdev->dev, data->tz);



	/* Disable monitoring */

	tmu_write(data, TMR_DISABLE, &data->regs->tmr);

drivers/thermal/rcar_gen3_thermal.c

+1 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *  R-Car Gen3 THS thermal sensor driver

 *  Based on rcar_thermal.c and work from Hien Dang and Khiem Nguyen.

 *

 * Copyright (C) 2016 Renesas Electronics Corporation.

 * Copyright (C) 2016 Sang Engineering

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; version 2 of the License.

 *

 *  This program is distributed in the hope that it will be useful, but

 *  WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 *  General Public License for more details.

 *

 */

#include <linux/delay.h>

#include <linux/err.h>

drivers/thermal/rcar_thermal.c

+2 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *  R-Car THS/TSC thermal sensor driver

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; version 2 of the License.

 *

 *  This program is distributed in the hope that it will be useful, but

 *  WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 *  General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

 */

#include <linux/delay.h>

#include <linux/err.h>
@@ -660,6 +648,6 @@ static struct platform_driver rcar_thermal_driver = { 
};

module_platform_driver(rcar_thermal_driver);



MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("R-Car THS/TSC thermal sensor driver");

MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");