BMC/Intel-BMC/linux.git/drivers/watchdog, branch dev-5.15-intel

Merge commit '49caedb668e476c100d727f2174724e0610a2b92' of https://github.com/openbmc/linux into openbmc/dev-5.15-intel-bump_v5.15.36

2022-05-12T14:46:40+00:00

Signed-off-by: Sujoy Ray

Merge tag 'v5.15.34' into dev-5.15

2022-04-14T08:19:30+00:00

This is the 5.15.34 stable release Signed-off-by: Joel Stanley

watchdog: rti-wdt: Add missing pm_runtime_disable() in probe function

2022-04-08T12:24:11+00:00

commit d055ef3a2c6919cff504ae3b710c96318d545fd2 upstream. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support") Signed-off-by: Miaoqian Lin Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20220105092114.23932-1-linmq006@gmail.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman

Merge commit '2befcc6bb0bb1e0a4a31391a359adcab3925b6e4' of https://github.com/openbmc/linux into openbmc/linux_5.15.24_bump

2022-03-11T20:10:46+00:00

Signed-off-by: Sujoy Ray

Merge tag 'v5.15.5' into dev-5.15

2021-11-25T23:12:27+00:00

This is the 5.15.5 stable release Signed-off-by: Joel Stanley

ar7: fix kernel builds for compiler test

2021-11-18T18:17:03+00:00

[ Upstream commit 28b7ee33a2122569ac065cad578bf23f50cc65c3 ] TI AR7 Watchdog Timer is only build for 32bit. Avoid error like: In file included from drivers/watchdog/ar7_wdt.c:29: ./arch/mips/include/asm/mach-ar7/ar7.h: In function ‘ar7_is_titan’: ./arch/mips/include/asm/mach-ar7/ar7.h:111:24: error: implicit declaration of function ‘KSEG1ADDR’; did you mean ‘CKSEG1ADDR’? [-Werror=implicit-function-declaration] 111 | return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) == | ^~~~~~~~~ | CKSEG1ADDR Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") Signed-off-by: Jackie Liu Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20210907024904.4127611-1-liu.yun@linux.dev Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin

watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT

2021-11-18T18:17:03+00:00

[ Upstream commit 164483c735190775f29d0dcbac0363adc51a068d ] The fintek watchdog timer can configure timeouts of second granularity only up to 255 seconds. Beyond that, the timeout needs to be configured with minute granularity. WDIOC_GETTIMEOUT should report the actual timeout configured, not just echo back the timeout configured by the user. Do so. Fixes: 96cb4eb019ce ("watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG") Suggested-by: Guenter Roeck Reviewed-by: Guenter Roeck Signed-off-by: Ahmad Fatoum Link: https://lore.kernel.org/r/5e17960fe8cc0e3cb2ba53de4730b75d9a0f33d5.1628525954.git-series.a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin

watchdog: aspeed: fix AST2600 support

2021-11-05T07:22:11+00:00

AST2600 provides different function of WDT0C[4] and it doesn't provides WDT10[1] so this commit fixes driver to make it available on AST2600. Signed-off-by: Jae Hyun Yoo

watchdog: npcm: Modify get reset status function

2021-11-01T06:42:45+00:00

Once the syscon phandle is not found the WD reset status will not be supported, so return to the function caller. OpenBMC-Staging-Count: 4 Signed-off-by: Tomer Maimon Link: https://lore.kernel.org/r/20210119223412.223492-5-tmaimon77@gmail.com Signed-off-by: Joel Stanley

watchdog: npcm: Add DT restart priority and reset type support

2021-11-01T06:42:44+00:00

Add device tree restart priority and three reset types support. OpenBMC-Staging-Count: 4 Signed-off-by: Tomer Maimon Link: https://lore.kernel.org/r/20210113200010.71845-7-tmaimon77@gmail.com Signed-off-by: Joel Stanley