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

Pull thermal management update from Zhang Rui:
 "Summary:

   - of-thermal extension to allow drivers to register and use its
     functionality in a better way, without exploiting thermal core.
     From Lukasz Majewski.

   - Fix a bug in intel_soc_dts_thermal driver which calls a sleep
     function in interrupt handler.  From Maurice Petallo.

   - add a thermal UAPI header file for exporting the thermal generic
     netlink information to user-space.  From Florian Fainelli.

   - First round of refactoring in Exynos driver.  Bartlomiej and Lukasz
     are attempting to make it lean and easier to understand.

   - New thermal driver for Rockchip (rk3288), with support for DT
     thermal.  From Caesar Wang.

   - New thermal driver for Nvidia, Tegra124 SOCTHERM driver, with
     support for DT thermal.  From Mikko Perttunen.

   - New cooling device, based on common clock framework.  From Eduardo
     Valentin.

   - a couple of small fixes in thermal core framework.  From Srinivas
     Pandruvada, Javi Merino, Luis Henriques.

   - Dropping Armada A375-Z1 SoC thermal support as the chip is not in
     the market, armada folks decided to drop its support.

   - a couple of small fixes and cleanups in int340x thermal driver"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (58 commits)
  thermal: provide an UAPI header file
  Thermal/int340x: Clear the error value of the last acpi_bus_get_device() call
  thermal/powerclamp: add id for braswell cpu
  thermal: Intel SoC DTS: Don't do thermal zone update inside spin_lock
  Thermal: fix platform_no_drv_owner.cocci warnings
  Thermal/int340x: avoid unnecessary pointer casting
  thermal: int3403: Delete a check before thermal_zone_device_unregister()
  thermal/int3400: export uuids
  thermal: of: Extend current of-thermal.c code to allow setting emulated temp
  thermal: of: Extend of-thermal to export table of trip points
  thermal: of: Rename struct __thermal_trip to struct thermal_trip
  thermal: of: Extend of-thermal.c to provide check if trip point is valid
  thermal: of: Extend of-thermal.c to provide number of trip points
  thermal: Fix error path in thermal_init()
  thermal: lock the thermal zone when switching governors
  thermal: core: ignore invalid trip temperature
  thermal: armada: Remove support for A375-Z1 SoC
  thermal: rockchip: add driver for thermal
  dt-bindings: document Rockchip thermal
  thermal: exynos: remove exynos_tmu_data.h include
  ...

1 files changed, 0 insertions, 20 deletions

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index eaaf59c98ba2..c2556cf5186b 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -35,10 +35,6 @@
 #define PMU_TDC0_OTF_CAL_MASK           (0x1 << 30)
 #define PMU_TDC0_START_CAL_MASK         (0x1 << 25)
 
-#define A375_Z1_CAL_RESET_LSB           0x8011e214
-#define A375_Z1_CAL_RESET_MSB           0x30a88019
-#define A375_Z1_WORKAROUND_BIT          BIT(9)
-
 #define A375_UNIT_CONTROL_SHIFT         27
 #define A375_UNIT_CONTROL_MASK          0x7
 #define A375_READOUT_INVERT             BIT(15)
@@ -124,24 +120,12 @@ static void armada375_init_sensor(struct platform_device *pdev,
                                   struct armada_thermal_priv *priv)
 {
         unsigned long reg;
-        bool quirk_needed =
-                !!of_device_is_compatible(pdev->dev.of_node,
-                                          "marvell,armada375-z1-thermal");
-
-        if (quirk_needed) {
-                /* Ensure these registers have the default (reset) values */
-                writel(A375_Z1_CAL_RESET_LSB, priv->control);
-                writel(A375_Z1_CAL_RESET_MSB, priv->control + 0x4);
-        }
 
         reg = readl(priv->control + 4);
         reg &= ~(A375_UNIT_CONTROL_MASK << A375_UNIT_CONTROL_SHIFT);
         reg &= ~A375_READOUT_INVERT;
         reg &= ~A375_HW_RESETn;
 
-        if (quirk_needed)
-                reg |= A375_Z1_WORKAROUND_BIT;
-
         writel(reg, priv->control + 4);
         mdelay(20);
 
@@ -260,10 +244,6 @@ static const struct of_device_id armada_thermal_id_table[] = {
                 .data       = &armada375_data,
         },
         {
-                .compatible = "marvell,armada375-z1-thermal",
-                .data       = &armada375_data,
-        },
-        {
                 .compatible = "marvell,armada380-thermal",
                 .data       = &armada380_data,
         },