Commit 4d064207 authored by Peng Fan's avatar Peng Fan Committed by Daniel Lezcano
Browse files

thermal/drivers/qoriq: Fix getting tmu range 



TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs.
So limit the len to 4 will report "invalid range data" for i.MX93.

This patch drop the local array with allocated ttrcr array and
able to support larger tmu ranges.

Fixes: f12d60c8 ("thermal/drivers/qoriq: Support version 2.1")
Tested-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20240226003657.3012880-1-peng.fan@oss.nxp.com
parent 79d99842

drivers/thermal/qoriq_thermal.c

+8 −4
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 
#define REGS_TTRnCR(n)	(0xf10 + 4 * (n)) /* Temperature Range n

					   * Control Register

					   */

#define NUM_TTRCR_V1	4

#define NUM_TTRCR_MAX	16



#define REGS_IPBRR(n)		(0xbf8 + 4 * (n)) /* IP Block Revision

						   * Register n

						   */
@@ -71,6 +74,7 @@ struct qoriq_sensor { 


struct qoriq_tmu_data {

	int ver;

	u32 ttrcr[NUM_TTRCR_MAX];

	struct regmap *regmap;

	struct clk *clk;

	struct qoriq_sensor	sensor[SITES_MAX];
@@ -182,17 +186,17 @@ static int qoriq_tmu_calibration(struct device *dev, 
				 struct qoriq_tmu_data *data)

{

	int i, val, len;

	u32 range[4];

	const u32 *calibration;

	struct device_node *np = dev->of_node;



	len = of_property_count_u32_elems(np, "fsl,tmu-range");

	if (len < 0 || len > 4) {

	if (len < 0 || (data->ver == TMU_VER1 && len > NUM_TTRCR_V1) ||

	    (data->ver > TMU_VER1 && len > NUM_TTRCR_MAX)) {

		dev_err(dev, "invalid range data.\n");

		return len;

	}



	val = of_property_read_u32_array(np, "fsl,tmu-range", range, len);

	val = of_property_read_u32_array(np, "fsl,tmu-range", data->ttrcr, len);

	if (val != 0) {

		dev_err(dev, "failed to read range data.\n");

		return val;
@@ -200,7 +204,7 @@ static int qoriq_tmu_calibration(struct device *dev, 


	/* Init temperature range registers */

	for (i = 0; i < len; i++)

		regmap_write(data->regmap, REGS_TTRnCR(i), range[i]);

		regmap_write(data->regmap, REGS_TTRnCR(i), data->ttrcr[i]);



	calibration = of_get_property(np, "fsl,tmu-calibration", &len);

	if (calibration == NULL || len % 8) {