]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
watchdog: sp5100_tco: Fix watchdog disable bit
authorGuenter Roeck <linux@roeck-us.net>
Sun, 24 Dec 2017 21:04:07 +0000 (13:04 -0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 6 Jun 2018 17:44:25 +0000 (13:44 -0400)
BugLink: http://bugs.launchpad.net/bugs/1774063
[ Upstream commit f541c09ebfc61697b586b38c9ebaf4b70defb278 ]

According to all published information, the watchdog disable bit for SB800
compatible controllers is bit 1 of PM register 0x48, not bit 2. For the
most part that doesn't matter in practice, since the bit has to be cleared
to enable watchdog address decoding, which is the default setting, but it
still needs to be fixed.

Cc: Zoltán Böszörményi <zboszor@pr.hu>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/watchdog/sp5100_tco.h

index 1af4dee7133717f3165de37bdadc3c82c15a7b4a..0e242d1110ce93c1829c5c0e13215ca25bd4e251 100644 (file)
@@ -55,7 +55,7 @@
 #define SB800_PM_WATCHDOG_CONFIG       0x4C
 
 #define SB800_PCI_WATCHDOG_DECODE_EN   (1 << 0)
-#define SB800_PM_WATCHDOG_DISABLE      (1 << 2)
+#define SB800_PM_WATCHDOG_DISABLE      (1 << 1)
 #define SB800_PM_WATCHDOG_SECOND_RES   (3 << 0)
 #define SB800_ACPI_MMIO_DECODE_EN      (1 << 0)
 #define SB800_ACPI_MMIO_SEL            (1 << 1)