diff options
| author | Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-03-13 19:14:41 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-03-13 19:14:41 +0100 |
| commit | 2e8ebed6ede01f187f8a06bbae3e3b3325bda36c (patch) | |
| tree | 4c4594857bb0b1455dcabae3c5638fcbe53c46b2 /drivers/watchdog/aspeed_wdt.c | |
| parent | 1462eecfc534fbfe85645d632527b358354fa3f4 (diff) | |
| parent | 8c088370c2a684acad45e0035d9f2dfd85087db0 (diff) | |
| download | linux-2e8ebed6ede01f187f8a06bbae3e3b3325bda36c.tar.gz | |
Merge branch 'v4.16-fixes'
Diffstat (limited to 'drivers/watchdog/aspeed_wdt.c')
| -rw-r--r-- | drivers/watchdog/aspeed_wdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index ca5b91e2eb92..d1987d63b37c 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -232,11 +232,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; } |