Commit c268a9d8 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Daniel Lezcano
Browse files

thermal/drivers/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: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarDragan Simic <dsimic@manjaro.org>
Tested-by: default avatarDiederik de Haas <didi.debian@cknow.org>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250820-thermal-rockchip-grf-warning-v2-2-c7e2d35017b8@kernel.org


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 6f769708

drivers/thermal/rockchip_thermal.c

+18 −5
Original line number Diff line number Diff line
@@ -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);