mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
d6d8851d12
Manually rebased: bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch bcm27xx/patches-5.15/950-0706-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch Removed upstreamed: bcm27xx/patches-5.15/950-0707-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch[1] bcm27xx/patches-5.15/950-0596-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch[2] ipq807x/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch [3] ipq807x/0034-v6.1-arm64-dts-qcom-ipq8074-fix-PCIe-PHY-serdes-size.patch [4] ipq807x/0103-arm64-dts-qcom-ipq8074-fix-Gen2-PCIe-QMP-PHY.patch [5] ipq807x/0104-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-QMP-PHY.patch [6] ipq807x/0105-arm64-dts-qcom-ipq8074-correct-Gen2-PCIe-ranges.patch [7] ipq807x/0108-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-node.patch [8] ipq807x/0109-arm64-dts-qcom-ipq8074-correct-PCIe-QMP-PHY-output-c.patch [9] ipq807x/0132-arm64-dts-qcom-ipq8074-correct-USB3-QMP-PHY-s-clock-.patch [10] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.99&id=d2991e6b30020e286f2dd9d3b4f43548c547caa6 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/vc4/vc4_dpi.c?h=v5.15.100&id=8e04aaffb6de5f1ae61de7b671c1531172ccf429 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=a55a645aa303a3f7ec37db69822d5420657626da 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=d9df682bcea57fa25f37bbf17eae56fa05662635 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=7e6eeb5fb3aa9e5feffdb6e137dcc06f5f6410e1 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=e88204931d9a60634cd50bbc679f045439c4b91d 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=1563af0f28afd3b6d64ac79a2aecced3969c90bf 8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=feb8c71f015d416f1afe90e1f62cf51e47376c67 9. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=69c7a270357a7d50ffd3471b14c60250041200e3 10. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=dd3d021ae5471d98adf81f1e897431c8657d0a18 Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3 Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Tested-by: Robert Marko <robimarko@gmail.com> #ipq807x/Dynalink WRX36 Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> #ipq807x/ax3600, x86_64/FW-7543B, ath79/tl-wdr3600, ipq806x/g10, ipq806x/nbg6817
102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
From 7805365fee582056b32c69cf35aafbb94b14a8ca Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Fri, 19 Aug 2022 00:02:43 +0200
|
|
Subject: [PATCH] thermal/drivers/tsens: Allow configuring min and max trips
|
|
|
|
IPQ8074 and IPQ6018 dont support negative trip temperatures and support
|
|
up to 204 degrees C as the max trip temperature.
|
|
|
|
So, instead of always setting the -40 as min and 120 degrees C as max
|
|
allow it to be configured as part of the features.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Link: https://lore.kernel.org/r/20220818220245.338396-3-robimarko@gmail.com
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
---
|
|
drivers/thermal/qcom/tsens-8960.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v0_1.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v1.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v2.c | 2 ++
|
|
drivers/thermal/qcom/tsens.c | 4 ++--
|
|
drivers/thermal/qcom/tsens.h | 4 ++++
|
|
6 files changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/thermal/qcom/tsens-8960.c
|
|
+++ b/drivers/thermal/qcom/tsens-8960.c
|
|
@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_
|
|
.adc = 1,
|
|
.srot_split = 0,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
struct tsens_plat_data data_8960 = {
|
|
--- a/drivers/thermal/qcom/tsens-v0_1.c
|
|
+++ b/drivers/thermal/qcom/tsens-v0_1.c
|
|
@@ -553,6 +553,8 @@ static struct tsens_features tsens_v0_1_
|
|
.adc = 1,
|
|
.srot_split = 1,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {
|
|
--- a/drivers/thermal/qcom/tsens-v1.c
|
|
+++ b/drivers/thermal/qcom/tsens-v1.c
|
|
@@ -277,6 +277,8 @@ static struct tsens_features tsens_v1_fe
|
|
.adc = 1,
|
|
.srot_split = 1,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
|
|
--- a/drivers/thermal/qcom/tsens-v2.c
|
|
+++ b/drivers/thermal/qcom/tsens-v2.c
|
|
@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_fe
|
|
.adc = 0,
|
|
.srot_split = 1,
|
|
.max_sensors = 16,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {
|
|
--- a/drivers/thermal/qcom/tsens.c
|
|
+++ b/drivers/thermal/qcom/tsens.c
|
|
@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor
|
|
dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
|
|
hw_id, __func__, low, high);
|
|
|
|
- cl_high = clamp_val(high, -40000, 120000);
|
|
- cl_low = clamp_val(low, -40000, 120000);
|
|
+ cl_high = clamp_val(high, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
|
|
+ cl_low = clamp_val(low, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
|
|
|
|
high_val = tsens_mC_to_hw(s, cl_high);
|
|
low_val = tsens_mC_to_hw(s, cl_low);
|
|
--- a/drivers/thermal/qcom/tsens.h
|
|
+++ b/drivers/thermal/qcom/tsens.h
|
|
@@ -501,6 +501,8 @@ enum regfield_ids {
|
|
* with SROT only being available to secure boot firmware?
|
|
* @has_watchdog: does this IP support watchdog functionality?
|
|
* @max_sensors: maximum sensors supported by this version of the IP
|
|
+ * @trip_min_temp: minimum trip temperature supported by this version of the IP
|
|
+ * @trip_max_temp: maximum trip temperature supported by this version of the IP
|
|
*/
|
|
struct tsens_features {
|
|
unsigned int ver_major;
|
|
@@ -510,6 +512,8 @@ struct tsens_features {
|
|
unsigned int srot_split:1;
|
|
unsigned int has_watchdog:1;
|
|
unsigned int max_sensors;
|
|
+ int trip_min_temp;
|
|
+ int trip_max_temp;
|
|
};
|
|
|
|
/**
|