| From ad3ce6353508dfe7c41e92589ff87b1d05f2881f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 1 Feb 2019 15:38:07 +0800 |
| Subject: thermal: mediatek: fix register index error |
| |
| From: Michael Kao <michael.kao@mediatek.com> |
| |
| [ 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 | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c |
| index 34169c32d4956..ea9558679634b 100644 |
| --- a/drivers/thermal/mtk_thermal.c |
| +++ b/drivers/thermal/mtk_thermal.c |
| @@ -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); |
| -- |
| 2.20.1 |
| |
