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

Pull thermal managament updates from Zhang Rui:
 "Specifics:

   - Abstract the code and introduce helper functions for all int340x
     thermal drivers.  From: Srinivas Pandruvada.

   - Reorganize the ACPI LPAT table support code so that it can be
     shared for both ACPI PMIC driver and int340x thermal driver.

   - Add support for Braswell in intel_soc_dts thermal driver.

   - a couple of small fixes/cleanups for step_wise governor and int340x
     thermal driver"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  Thermal/int340x_thermal: remove unused uuids.
  thermal: step_wise: spelling fixes
  thermal: int340x: fix sparse warning
  Thermal/int340x: LPAT conversion for temperature
  ACPI / PMIC: Use common LPAT table handling functions
  ACPI / LPAT: Common table processing functions
  thermal: Intel SoC DTS: Add Braswell support
  Thermal/int340x/int3402: Provide notification support
  Thermal/int340x/processor_thermal: Add thermal zone support
  Thermal/int340x/int3403: Use int340x thermal API
  Thermal/int340x/int3402: Use int340x thermal API
  Thermal/int340x: Add common thermal zone handler
This commit is contained in:
Linus Torvalds
2015-02-19 11:28:36 -08:00
13 changed files with 758 additions and 505 deletions

65
include/acpi/acpi_lpat.h Normal file
View File

@@ -0,0 +1,65 @@
/*
* acpi_lpat.h - LPAT table processing functions
*
* Copyright (C) 2015 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version
* 2 as published by the Free Software Foundation.
*
* 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.
*/
#ifndef ACPI_LPAT_H
#define ACPI_LPAT_H
struct acpi_lpat {
int temp;
int raw;
};
struct acpi_lpat_conversion_table {
struct acpi_lpat *lpat;
int lpat_count;
};
#ifdef CONFIG_ACPI
int acpi_lpat_raw_to_temp(struct acpi_lpat_conversion_table *lpat_table,
int raw);
int acpi_lpat_temp_to_raw(struct acpi_lpat_conversion_table *lpat_table,
int temp);
struct acpi_lpat_conversion_table *acpi_lpat_get_conversion_table(acpi_handle
handle);
void acpi_lpat_free_conversion_table(struct acpi_lpat_conversion_table
*lpat_table);
#else
static int acpi_lpat_raw_to_temp(struct acpi_lpat_conversion_table *lpat_table,
int raw)
{
return 0;
}
static int acpi_lpat_temp_to_raw(struct acpi_lpat_conversion_table *lpat_table,
int temp)
{
return 0;
}
static struct acpi_lpat_conversion_table *acpi_lpat_get_conversion_table(
acpi_handle handle)
{
return NULL;
}
static void acpi_lpat_free_conversion_table(struct acpi_lpat_conversion_table
*lpat_table)
{
}
#endif
#endif