| From 4c0da842cfec15d506122607851986cec7673fd2 Mon Sep 17 00:00:00 2001 |
| From: Ryan Chen <ryan_chen@aspeedtech.com> |
| Date: Mon, 19 Aug 2019 14:47:38 +0930 |
| Subject: [PATCH] watchdog: aspeed: Add support for AST2600 |
| |
| commit b3528b4874480818e38e4da019d655413c233e6a upstream. |
| |
| The ast2600 can be supported by the same code as the ast2500. |
| |
| Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> |
| Signed-off-by: Joel Stanley <joel@jms.id.au> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Link: https://lore.kernel.org/r/20190819051738.17370-3-joel@jms.id.au |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c |
| index f0148637e5dd..a6c78e123ef5 100644 |
| --- a/drivers/watchdog/aspeed_wdt.c |
| +++ b/drivers/watchdog/aspeed_wdt.c |
| @@ -34,6 +34,7 @@ static const struct aspeed_wdt_config ast2500_config = { |
| static const struct of_device_id aspeed_wdt_of_table[] = { |
| { .compatible = "aspeed,ast2400-wdt", .data = &ast2400_config }, |
| { .compatible = "aspeed,ast2500-wdt", .data = &ast2500_config }, |
| + { .compatible = "aspeed,ast2600-wdt", .data = &ast2500_config }, |
| { }, |
| }; |
| MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); |
| @@ -259,7 +260,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) |
| set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); |
| } |
| |
| - if (of_device_is_compatible(np, "aspeed,ast2500-wdt")) { |
| + if ((of_device_is_compatible(np, "aspeed,ast2500-wdt")) || |
| + (of_device_is_compatible(np, "aspeed,ast2600-wdt"))) { |
| u32 reg = readl(wdt->base + WDT_RESET_WIDTH); |
| |
| reg &= config->ext_pulse_width_mask; |
| -- |
| 2.7.4 |
| |
