]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
watchdog: aspeed: Retain watchdog enabled state
authorAndrew Jeffery <andrew@aj.id.au>
Wed, 20 Sep 2017 05:30:17 +0000 (15:00 +0930)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 28 Dec 2017 19:44:48 +0000 (20:44 +0100)
commit9f3e13c74e1b4f370c3de06cb504c003091c9673
treefbd78134e88a095eb1e8667a3dbe2e55388bb7d9
parentbe17980d9be5a5c1ece83836b24fabce648b92aa
watchdog: aspeed: Retain watchdog enabled state

An unintended post-condition of probe() is that the watchdog is
disabled. This behaviour was introduced by an unnecessary write to the
control register to configure the hardware based on the devicetree. The
write is unnecessary because the cached control value that is
manipulated by the code parsing the devicetree is eventually written by
aspeed_wdt_enable(), which is when we care how the control register
should be configured.

Remove the write to restore expected behaviour.

Fixes: b7f0b8ad25f3 ("drivers/watchdog: ASPEED reference dev tree properties for config")
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
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