watchdog: aspeed: Fix translation of reset mode to ctrl register

[ Upstream commit d2fc8db691bf3197d43b2afb553311a9bf257bff ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index 9612e2342c8962098fef7dd708aff5ecb34ceacb..fd91007b4e41b38a342cad024510edce46c06612 100644 (file)
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -234,11 +234,14 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
                wdt->ctrl |= WDT_CTRL_RESET_MODE_SOC | WDT_CTRL_RESET_SYSTEM;
        } else {
                if (!strcmp(reset_type, "cpu"))
-                       wdt->ctrl |= WDT_CTRL_RESET_MODE_ARM_CPU;
+                       wdt->ctrl |= WDT_CTRL_RESET_MODE_ARM_CPU |
+                                    WDT_CTRL_RESET_SYSTEM;
                else if (!strcmp(reset_type, "soc"))
-                       wdt->ctrl |= WDT_CTRL_RESET_MODE_SOC;
+                       wdt->ctrl |= WDT_CTRL_RESET_MODE_SOC |
+                                    WDT_CTRL_RESET_SYSTEM;
                else if (!strcmp(reset_type, "system"))
-                       wdt->ctrl |= WDT_CTRL_RESET_SYSTEM;
+                       wdt->ctrl |= WDT_CTRL_RESET_MODE_FULL_CHIP |
+                                    WDT_CTRL_RESET_SYSTEM;
                else if (strcmp(reset_type, "none"))
                        return -EINVAL;
        }