thermal: mediatek: fix register index error
authorMichael Kao <michael.kao@mediatek.com>
Fri, 1 Feb 2019 07:38:07 +0000 (15:38 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:24:14 +0000 (10:24 +0100)
[ Upstream commit eb9aecd90d1a39601e91cd08b90d5fee51d321a6 ]

The index of msr and adcpnp should match the sensor
which belongs to the selected bank in the for loop.

Fixes: b7cf0053738c ("thermal: Add Mediatek thermal driver for mt2701.")
Signed-off-by: Michael Kao <michael.kao@mediatek.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/thermal/mtk_thermal.c

index 34169c32d4956ffe8bb146ab0ae66a8f4ebbdbf2..ea9558679634b3128c33e71ef38389ae7baad86c 100644 (file)
@@ -348,7 +348,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)
        u32 raw;
 
        for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) {
-               raw = readl(mt->thermal_base + conf->msr[i]);
+               raw = readl(mt->thermal_base +
+                           conf->msr[conf->bank_data[bank->id].sensors[i]]);
 
                temp = raw_to_mcelsius(mt,
                                       conf->bank_data[bank->id].sensors[i],
@@ -485,7 +486,8 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num,
 
        for (i = 0; i < conf->bank_data[num].num_sensors; i++)
                writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]],
-                      mt->thermal_base + conf->adcpnp[i]);
+                      mt->thermal_base +
+                      conf->adcpnp[conf->bank_data[num].sensors[i]]);
 
        writel((1 << conf->bank_data[num].num_sensors) - 1,
               mt->thermal_base + TEMP_MONCTL0);