diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-12-12 12:05:35 +0100 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2016-12-14 05:32:08 +0100 |
| commit | 18591add41ec9558ce0e32ef88626c18cc70c686 (patch) | |
| tree | 52ee4a9ad20ad134b128d7e7d88850f7361a6d60 | |
| parent | thermal: rockchip: optimize the conversion table (diff) | |
| download | linux-18591add41ec9558ce0e32ef88626c18cc70c686.tar.xz linux-18591add41ec9558ce0e32ef88626c18cc70c686.zip | |
thermal: rockchip: handle set_trips without the trip points
In some cases, some sensors didn't need the trip points, the
set_trips will pass {-INT_MAX, INT_MAX} to trigger tsadc alarm in the end,
ignore this case and disable the high temperature interrupt.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
| -rw-r--r-- | drivers/thermal/rockchip_thermal.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index cacc12b44ca1..cbbf0ce2302c 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -674,7 +674,21 @@ static int rk_tsadcv2_get_temp(const struct chip_tsadc_table *table, static int rk_tsadcv2_alarm_temp(const struct chip_tsadc_table *table, int chn, void __iomem *regs, int temp) { - u32 alarm_value, int_en; + u32 alarm_value; + u32 int_en, int_clr; + + /* + * In some cases, some sensors didn't need the trip points, the + * set_trips will pass {-INT_MAX, INT_MAX} to trigger tsadc alarm + * in the end, ignore this case and disable the high temperature + * interrupt. + */ + if (temp == INT_MAX) { + int_clr = readl_relaxed(regs + TSADCV2_INT_EN); + int_clr &= ~TSADCV2_INT_SRC_EN(chn); + writel_relaxed(int_clr, regs + TSADCV2_INT_EN); + return 0; + } /* Make sure the value is valid */ alarm_value = rk_tsadcv2_temp_to_code(table, temp); |