ipq807x: 6.1: refresh patches

[openwrt/staging/jow.git] / target / linux / ipq807x / patches-6.1 / 0042-v6.2-thermal-drivers-tsens-Add-support-for-combined-inter.patch

diff --git a/target/linux/ipq807x/patches-6.1/0042-v6.2-thermal-drivers-tsens-Add-support-for-combined-inter.patch b/target/linux/ipq807x/patches-6.1/0042-v6.2-thermal-drivers-tsens-Add-support-for-combined-inter.patch
index 2c6e70b14d44d029ec9188f70d30789c96276d74..032072599968f15959d158b69a2ceb1e1c8a2eba 100644 (file)
--- a/target/linux/ipq807x/patches-6.1/0042-v6.2-thermal-drivers-tsens-Add-support-for-combined-inter.patch
+++ b/target/linux/ipq807x/patches-6.1/0042-v6.2-thermal-drivers-tsens-Add-support-for-combined-inter.patch
@@ -61,7 +61,7 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
        .max_sensors    = 16,
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -531,6 +531,27 @@ static irqreturn_t tsens_irq_thread(int
+@@ -532,6 +532,27 @@ static irqreturn_t tsens_irq_thread(int
        return IRQ_HANDLED;
  }
  
@@ -86,10 +86,10 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
 +      return tsens_irq_thread(irq, data);
 +}
 +
- static int tsens_set_trips(void *_sensor, int low, int high)
+ static int tsens_set_trips(struct thermal_zone_device *tz, int low, int high)
  {
-       struct tsens_sensor *s = _sensor;
-@@ -1081,13 +1102,18 @@ static int tsens_register(struct tsens_p
+       struct tsens_sensor *s = tz->devdata;
+@@ -1074,13 +1095,18 @@ static int tsens_register(struct tsens_p
                                   tsens_mC_to_hw(priv->sensor, 0));
        }
  
@@ -116,7 +116,7 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  }
 --- a/drivers/thermal/qcom/tsens.h
 +++ b/drivers/thermal/qcom/tsens.h
-@@ -495,6 +495,7 @@ enum regfield_ids {
+@@ -493,6 +493,7 @@ enum regfield_ids {
   * struct tsens_features - Features supported by the IP
   * @ver_major: Major number of IP version
   * @crit_int: does the IP support critical interrupts?
@@ -124,7 +124,7 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
   * @adc:      do the sensors only output adc code (instead of temperature)?
   * @srot_split: does the IP neatly splits the register space into SROT and TM,
   *              with SROT only being available to secure boot firmware?
-@@ -504,6 +505,7 @@ enum regfield_ids {
+@@ -502,6 +503,7 @@ enum regfield_ids {
  struct tsens_features {
        unsigned int ver_major;
        unsigned int crit_int:1;