Merge tag 'for-6.9/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[linux-2.6-microblaze.git] / drivers / thermal / qoriq_thermal.c

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index ccc2eea..404f01c 100644 (file)
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -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) {