]> www.infradead.org Git - users/jedix/linux-maple.git/commit
watchdog: aspeed: Fix translation of reset mode to ctrl register
authorMilton Miller <miltonm@us.ibm.com>
Fri, 9 Mar 2018 21:58:19 +0000 (15:58 -0600)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Tue, 13 Mar 2018 18:14:17 +0000 (19:14 +0100)
commitd2fc8db691bf3197d43b2afb553311a9bf257bff
tree9daf53c3e3a8ac4992991efca232c53cda300d00
parent977f6f68331f94bb72ad84ee96b7b87ce737d89d
watchdog: aspeed: Fix translation of reset mode to ctrl register

Assert RESET_SYSTEM bit for any reset and set MODE field from reset
type.

The watchdog control register has a RESET_SYSTEM bit that is really
closer to activate a reset, and RESET_SYSTEM_MODE field that chooses
how much to reset.

Before this patch, a node without these optional property would do a
SOC reset, but a node with properties requesting a cpu or SOC reset
would do nothing and a node requesting a system reset would do a
SOC reset.

Fixes: b7f0b8ad25f3 ("drivers/watchdog: ASPEED reference dev tree properties for config")
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
Signed-off-by: Eddie James <eajames@linux.vnet.ibm.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@iguana.be>
drivers/watchdog/aspeed_wdt.c