lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 173/639] thermal: mediatek: fix register index error
    Date
    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 0691f260f6eab..f64643629d8b5 100644
    --- a/drivers/thermal/mtk_thermal.c
    +++ b/drivers/thermal/mtk_thermal.c
    @@ -431,7 +431,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],
    @@ -568,7 +569,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


    \
     
     \ /
      Last update: 2020-01-24 12:43    [W:3.517 / U:2.916 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site