Commit 98db5e55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal updates from Zhang Rui:
 "Thermal core and intel thermal drivers:

   - convert thermal sysfs attributes to use DEVICE_ATTR_{RO|RW|WO}()
     variants (Viresh Kumar)

   - update license to SPDX format (Lina Iyer)

   - add GeminiLake support for int340x processor_thermal driver (Sumeet
     Pawnikar)

   - prevent error in reading trip hysteresis attribute for int340x
     thermal driver (Srinivas Pandruvada)"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: int340x: processor_thermal: Add GeminiLake support
  drivers: thermal: Update license to SPDX format
  thermal: int340x: Prevent error in reading trip hysteresis attribute
  thermal: Use DEVICE_ATTR_{RO|RW|WO}() variants
  thermal: Shorten name of sysfs callbacks
parents 7259f645 e9ed3ee6

drivers/thermal/int340x_thermal/int340x_thermal_zone.c

+3 −3
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone, 


	status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);

	if (ACPI_FAILURE(status))

		return -EIO;



		*temp = 0;

	else

		*temp = hyst * 100;



	return 0;

drivers/thermal/int340x_thermal/processor_thermal_device.c

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
#define PCI_DEVICE_ID_PROC_BXTX_THERMAL  0x4A8C

#define PCI_DEVICE_ID_PROC_BXTP_THERMAL  0x5A8C



/* GeminiLake thermal reporting device */

#define PCI_DEVICE_ID_PROC_GLK_THERMAL	0x318C



struct power_config {

	u32	index;

	u32	min_uw;
@@ -467,6 +470,7 @@ static const struct pci_device_id proc_thermal_pci_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXTP_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CNL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_CFL_THERMAL)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_GLK_THERMAL)},

	{ 0, },

};

drivers/thermal/of-thermal.c

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

/*

 *  of-thermal.c - Generic Thermal Management device tree support.

 *

 *  Copyright (C) 2013 Texas Instruments

 *  Copyright (C) 2013 Eduardo Valentin <eduardo.valentin@ti.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/thermal.h>

#include <linux/slab.h>

drivers/thermal/thermal_core.c

+4 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *  thermal.c - Generic Thermal Management Sysfs support.

 *

 *  Copyright (C) 2008 Intel Corp

 *  Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>

 *  Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.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.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -736,7 +733,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	sysfs_attr_init(&dev->attr.attr);

	dev->attr.attr.name = dev->attr_name;

	dev->attr.attr.mode = 0444;

	dev->attr.show = thermal_cooling_device_trip_point_show;

	dev->attr.show = trip_point_show;

	result = device_create_file(&tz->device, &dev->attr);

	if (result)

		goto remove_symbol_link;
@@ -745,8 +742,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	sysfs_attr_init(&dev->weight_attr.attr);

	dev->weight_attr.attr.name = dev->weight_attr_name;

	dev->weight_attr.attr.mode = S_IWUSR | S_IRUGO;

	dev->weight_attr.show = thermal_cooling_device_weight_show;

	dev->weight_attr.store = thermal_cooling_device_weight_store;

	dev->weight_attr.show = weight_show;

	dev->weight_attr.store = weight_store;

	result = device_create_file(&tz->device, &dev->weight_attr);

	if (result)

		goto remove_trip_file;

drivers/thermal/thermal_core.h

+5 −25
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  thermal_core.h

 *

 *  Copyright (C) 2012  Intel Corp

 *  Author: Durgadoss R <durgadoss.r@intel.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.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#ifndef __THERMAL_CORE_H__
@@ -75,15 +60,10 @@ void thermal_zone_destroy_device_groups(struct thermal_zone_device *); 
void thermal_cooling_device_setup_sysfs(struct thermal_cooling_device *);

void thermal_cooling_device_destroy_sysfs(struct thermal_cooling_device *cdev);

/* used only at binding time */

ssize_t

thermal_cooling_device_trip_point_show(struct device *,

				       struct device_attribute *, char *);

ssize_t thermal_cooling_device_weight_show(struct device *,

					   struct device_attribute *, char *);



ssize_t thermal_cooling_device_weight_store(struct device *,

					    struct device_attribute *,

					    const char *, size_t);

ssize_t trip_point_show(struct device *, struct device_attribute *, char *);

ssize_t weight_show(struct device *, struct device_attribute *, char *);

ssize_t weight_store(struct device *, struct device_attribute *, const char *,

		     size_t);



#ifdef CONFIG_THERMAL_STATISTICS

void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE