mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
watchdog: meson: Fix the wrong value of left time
[ Upstream commit2c77734642
] The left time value is wrong when we get it by sysfs. The left time value should be equal to preset timeout value minus elapsed time value. According to the Meson-GXB/GXL datasheets which can be found at [0], the timeout value is saved to BIT[0-15] of the WATCHDOG_TCNT, and elapsed time value is saved to BIT[16-31] of the WATCHDOG_TCNT. [0]: http://linux-meson.com Fixes:683fa50f0e
("watchdog: Add Meson GXBB Watchdog Driver") Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
de8d7ad94e
commit
477daab606
1 changed files with 2 additions and 2 deletions
|
@ -137,8 +137,8 @@ static unsigned int meson_gxbb_wdt_get_timeleft(struct watchdog_device *wdt_dev)
|
||||||
|
|
||||||
reg = readl(data->reg_base + GXBB_WDT_TCNT_REG);
|
reg = readl(data->reg_base + GXBB_WDT_TCNT_REG);
|
||||||
|
|
||||||
return ((reg >> GXBB_WDT_TCNT_CNT_SHIFT) -
|
return ((reg & GXBB_WDT_TCNT_SETUP_MASK) -
|
||||||
(reg & GXBB_WDT_TCNT_SETUP_MASK)) / 1000;
|
(reg >> GXBB_WDT_TCNT_CNT_SHIFT)) / 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct watchdog_ops meson_gxbb_wdt_ops = {
|
static const struct watchdog_ops meson_gxbb_wdt_ops = {
|
||||||
|
|
Loading…
Reference in a new issue