mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
93 lines
2.8 KiB
Diff
93 lines
2.8 KiB
Diff
From f895f1f4de0b7252f29e7e5779727b303df9e58d Mon Sep 17 00:00:00 2001
|
|
From: schaecsn <schaecsn@gmx.net>
|
|
Date: Sun, 17 Nov 2019 21:24:13 -0800
|
|
Subject: [PATCH] thermal: rockchip: enable hwmon
|
|
|
|
Enable hwmon for the soc and gpu temperature sensors.
|
|
|
|
Signed-off-by: Stefan Schaeckeler <schaecsn@gmx.net>
|
|
---
|
|
drivers/thermal/rockchip_thermal.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
|
|
index 343c2f5c5a25..e47c60010259 100644
|
|
--- a/drivers/thermal/rockchip_thermal.c
|
|
+++ b/drivers/thermal/rockchip_thermal.c
|
|
@@ -19,6 +19,8 @@
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/pinctrl/consumer.h>
|
|
|
|
+#include "thermal_hwmon.h"
|
|
+
|
|
/**
|
|
* If the temperature over a period of time High,
|
|
* the resulting TSHUT gave CRU module,let it reset the entire chip,
|
|
@@ -1321,8 +1323,15 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
|
|
|
|
thermal->chip->control(thermal->regs, true);
|
|
|
|
- for (i = 0; i < thermal->chip->chn_num; i++)
|
|
+ for (i = 0; i < thermal->chip->chn_num; i++) {
|
|
rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);
|
|
+ thermal->sensors[i].tzd->tzp->no_hwmon = false;
|
|
+ error = thermal_add_hwmon_sysfs(thermal->sensors[i].tzd);
|
|
+ if (error)
|
|
+ dev_warn(&pdev->dev,
|
|
+ "failed to register sensor %d with hwmon: %d\n",
|
|
+ i, error);
|
|
+ }
|
|
|
|
platform_set_drvdata(pdev, thermal);
|
|
|
|
@@ -1344,6 +1353,7 @@ static int rockchip_thermal_remove(struct platform_device *pdev)
|
|
for (i = 0; i < thermal->chip->chn_num; i++) {
|
|
struct rockchip_thermal_sensor *sensor = &thermal->sensors[i];
|
|
|
|
+ thermal_remove_hwmon_sysfs(sensor->tzd);
|
|
rockchip_thermal_toggle_sensor(sensor, false);
|
|
}
|
|
|
|
|
|
From b5bcb54fe763aa9f40bae7af7e0629a3a6b93a52 Mon Sep 17 00:00:00 2001
|
|
From: Robin Murphy <robin.murphy@arm.com>
|
|
Date: Thu, 28 Nov 2019 20:59:27 +0000
|
|
Subject: [PATCH] arm64: dts: rockchip: Add GPU cooling device for RK3399
|
|
|
|
As for RK3288, now that we have a binding for the GPU we can
|
|
hook up the missing cooling device for the thermal zone.
|
|
|
|
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
index e62ea0e2b657..aa0838adb224 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
@@ -827,6 +827,14 @@
|
|
type = "critical";
|
|
};
|
|
};
|
|
+
|
|
+ cooling-maps {
|
|
+ map0 {
|
|
+ trip = <&gpu_alert0>;
|
|
+ cooling-device =
|
|
+ <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
|
|
@@ -1886,6 +1894,7 @@
|
|
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>;
|
|
interrupt-names = "gpu", "job", "mmu";
|
|
clocks = <&cru ACLK_GPU>;
|
|
+ #cooling-cells = <2>;
|
|
power-domains = <&power RK3399_PD_GPU>;
|
|
status = "disabled";
|
|
};
|
|
|