mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
146 lines
6.0 KiB
Diff
146 lines
6.0 KiB
Diff
From 69a30622c1b1abe35cb257c453dfc9e1e1974fe9 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Date: Wed, 20 Aug 2025 19:40:48 +0200
|
|
Subject: [PATCH 042/110] FROMLIST(v2): thermal: rockchip: shut up GRF warning
|
|
|
|
Most of the recent Rockchip devices do not have a GRF associated
|
|
with the tsadc IP. Let's avoid printing a warning on those devices.
|
|
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
|
|
Tested-by: Diederik de Haas <didi.debian@cknow.org>
|
|
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
|
|
---
|
|
drivers/thermal/rockchip_thermal.c | 23 ++++++++++++++++++-----
|
|
1 file changed, 18 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
|
|
index 7b18a705dfad..c49ddf70f86e 100644
|
|
--- a/drivers/thermal/rockchip_thermal.c
|
|
+++ b/drivers/thermal/rockchip_thermal.c
|
|
@@ -74,6 +74,7 @@ struct chip_tsadc_table {
|
|
* @tshut_temp: the hardware-controlled shutdown temperature value, with no trim
|
|
* @tshut_mode: the hardware-controlled shutdown mode (0:CRU 1:GPIO)
|
|
* @tshut_polarity: the hardware-controlled active polarity (0:LOW 1:HIGH)
|
|
+ * @grf_required: true, if a GRF is required for proper functionality
|
|
* @initialize: SoC special initialize tsadc controller method
|
|
* @irq_ack: clear the interrupt
|
|
* @control: enable/disable method for the tsadc controller
|
|
@@ -97,6 +98,9 @@ struct rockchip_tsadc_chip {
|
|
enum tshut_mode tshut_mode;
|
|
enum tshut_polarity tshut_polarity;
|
|
|
|
+ /* GRF availability */
|
|
+ bool grf_required;
|
|
+
|
|
/* Chip-wide methods */
|
|
void (*initialize)(struct regmap *grf,
|
|
void __iomem *reg, enum tshut_polarity p);
|
|
@@ -1098,6 +1102,7 @@ static const struct rockchip_tsadc_chip px30_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 2, /* 2 channels for tsadc */
|
|
+ .grf_required = true,
|
|
.tshut_mode = TSHUT_MODE_CRU, /* default TSHUT via CRU */
|
|
.tshut_temp = 95000,
|
|
.initialize = rk_tsadcv4_initialize,
|
|
@@ -1119,6 +1124,7 @@ static const struct rockchip_tsadc_chip rv1108_tsadc_data = {
|
|
/* cpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 1, /* one channel for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1141,6 +1147,7 @@ static const struct rockchip_tsadc_chip rk3228_tsadc_data = {
|
|
/* cpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 1, /* one channel for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1163,6 +1170,7 @@ static const struct rockchip_tsadc_chip rk3288_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 1,
|
|
.chn_num = 2, /* two channels for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1185,6 +1193,7 @@ static const struct rockchip_tsadc_chip rk3328_tsadc_data = {
|
|
/* cpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 1, /* one channels for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_CRU, /* default TSHUT via CRU */
|
|
.tshut_temp = 95000,
|
|
.initialize = rk_tsadcv2_initialize,
|
|
@@ -1206,6 +1215,7 @@ static const struct rockchip_tsadc_chip rk3366_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 2, /* two channels for tsadc */
|
|
+ .grf_required = true,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1228,6 +1238,7 @@ static const struct rockchip_tsadc_chip rk3368_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 2, /* two channels for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1250,6 +1261,7 @@ static const struct rockchip_tsadc_chip rk3399_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 2, /* two channels for tsadc */
|
|
+ .grf_required = true,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1272,6 +1284,7 @@ static const struct rockchip_tsadc_chip rk3568_tsadc_data = {
|
|
/* cpu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 2, /* two channels for tsadc */
|
|
+ .grf_required = true,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1294,6 +1307,7 @@ static const struct rockchip_tsadc_chip rk3576_tsadc_data = {
|
|
/* top, big_core, little_core, ddr, npu, gpu */
|
|
.chn_offset = 0,
|
|
.chn_num = 6, /* six channels for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1318,6 +1332,7 @@ static const struct rockchip_tsadc_chip rk3588_tsadc_data = {
|
|
/* top, big_core0, big_core1, little_core, center, gpu, npu */
|
|
.chn_offset = 0,
|
|
.chn_num = 7, /* seven channels for tsadc */
|
|
+ .grf_required = false,
|
|
.tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */
|
|
.tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
|
|
.tshut_temp = 95000,
|
|
@@ -1594,12 +1609,10 @@ static int rockchip_configure_from_dt(struct device *dev,
|
|
return -EINVAL;
|
|
}
|
|
|
|
- /* The tsadc wont to handle the error in here since some SoCs didn't
|
|
- * need this property.
|
|
- */
|
|
thermal->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
|
|
- if (IS_ERR(thermal->grf))
|
|
- dev_warn(dev, "Missing rockchip,grf property\n");
|
|
+ if (IS_ERR(thermal->grf) && thermal->chip->grf_required)
|
|
+ return dev_err_probe(dev, PTR_ERR(thermal->grf),
|
|
+ "Missing rockchip,grf property\n");
|
|
|
|
rockchip_get_trim_configuration(dev, np, thermal);
|
|
|
|
--
|
|
2.34.1
|
|
|