mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
f4b1b358fe
uboot: - immortalwrt/immortalwrt@7a042afdee uboot-rockchip: fix RockPro64 boot from eMMC - immortalwrt/immortalwrt@f450acefb0 uboot-rockchip: update to v2021.01 - immortalwrt/immortalwrt@5cc1d3df78 rockchip: improve support for NanoPi R4S - immortalwrt/immortalwrt@83d3fb9634 uboot-rockchip: add NanoPi R4S support - immortalwrt/immortalwrt@3d86ffedd7 uboot-rockchip: update to v2020.10 - immortalwrt/immortalwrt@fe5fa0c7ab Revert "uboot-rockchip: fix nanopi-r2s failed to boot on some sd cards" target: - immortalwrt/immortalwrt@f67522e532 rockchip: add support for Radxa Rock Pi 4 - immortalwrt/immortalwrt@cd7fd0c77b rockchip: add NanoPi R4S support - immortalwrt/immortalwrt@02395293a2 rockchip: fix SUPPORTED_DEVICES for Radxa ROCK Pi 4 - immortalwrt/immortalwrt@c7b200b8a2 rockchip: re-order patches - immortalwrt/immortalwrt@aee038e773 rockchip: refresh Kconfig - immortalwrt/immortalwrt@22061b2880 kernel: enable CONFIG_LEDS_TRIGGER_HEARTBEAT - immortalwrt/immortalwrt@b1150de9e4 rockchip: add missing Kconfig symbols - immortalwrt/immortalwrt@ab28d07c3b treewide: fix spelling 'seperate' -> 'separate' - immortalwrt/immortalwrt@6401fca74d rockchip: use native mac address for NanoPi R4S Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From d27970b82a0f552f70e76fab154855b3192aac23 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Schaeckeler <schaecsn@gmx.net>
|
|
Date: Wed, 11 Dec 2019 22:17:02 -0800
|
|
Subject: thermal: rockchip: Enable hwmon
|
|
|
|
By default, of-based thermal drivers do not enable hwmon.
|
|
Explicitly enable hwmon for both, the soc and gpu temperature
|
|
sensor.
|
|
|
|
Signed-off-by: Stefan Schaeckeler <schaecsn@gmx.net>
|
|
Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Link: https://lore.kernel.org/r/20191212061702.BFE2D6E85603@corona.crabdance.com
|
|
---
|
|
drivers/thermal/rockchip_thermal.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/thermal/rockchip_thermal.c
|
|
+++ b/drivers/thermal/rockchip_thermal.c
|
|
@@ -58,6 +58,8 @@ enum adc_sort_mode {
|
|
ADC_INCREMENT,
|
|
};
|
|
|
|
+#include "thermal_hwmon.h"
|
|
+
|
|
/**
|
|
* The max sensors is two in rockchip SoCs.
|
|
* Two sensors: CPU and GPU sensor.
|
|
@@ -1321,8 +1323,15 @@ static int rockchip_thermal_probe(struct
|
|
|
|
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(struc
|
|
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);
|
|
}
|
|
|