From: Vince Chang <vince_chang@aspeedtech.com>
To: <openbmc@lists.ozlabs.org>, <andrew@codeconstruct.com.au>,
<tan.siewert@9elements.com>
Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>, <joel@jms.id.au>,
"Guenter Roeck" <linux@roeck-us.net>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Subject: [PATCH linux dev-6.18 3/4] watchdog: aspeed: Add support for AST2700 platform
Date: Thu, 29 Oct 2026 13:08:44 +0800 [thread overview]
Message-ID: <20261029050847.810331-4-vince_chang@aspeedtech.com> (raw)
In-Reply-To: <20261029050847.810331-1-vince_chang@aspeedtech.com>
From: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
Add AST2700 platform support to the ASPEED watchdog driver. This includes
a new per-platform configuration with SCU reset status register at
SCU1_070 and support for 5 reset mask registers.
Signed-off-by: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.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@linux-watchdog.org>
(cherry picked from commit 13e86646710dd5e1ec68798ab44773e314612d83)
Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
---
drivers/watchdog/aspeed_wdt.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index d23e565f30a8..c9e79851504c 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -83,10 +83,24 @@ static const struct aspeed_wdt_config ast2600_config = {
.num_reset_masks = 2,
};
+static const struct aspeed_wdt_config ast2700_config = {
+ .ext_pulse_width_mask = 0xfffff,
+ .irq_shift = 0,
+ .irq_mask = GENMASK(31, 10),
+ .scu = {
+ .compatible = "aspeed,ast2700-scu0",
+ .reset_status_reg = 0x70,
+ .wdt_reset_mask = 0xf,
+ .wdt_reset_mask_shift = 0,
+ },
+ .num_reset_masks = 5,
+};
+
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 = &ast2600_config },
+ { .compatible = "aspeed,ast2700-wdt", .data = &ast2700_config },
{ },
};
MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table);
@@ -483,7 +497,7 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
}
if (!of_device_is_compatible(np, "aspeed,ast2400-wdt")) {
- u32 reset_mask[2];
+ u32 reset_mask[5];
size_t nrstmask = wdt->cfg->num_reset_masks;
u32 reg = readl(wdt->base + WDT_RESET_WIDTH);
int i;
--
2.43.0
next prev parent reply other threads:[~2026-10-29 5:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-29 5:08 [PATCH linux dev-6.18 0/4] Backport ASPEED AST2700 watchdog support Vince Chang
2026-10-29 5:08 ` [PATCH linux dev-6.18 1/4] dt-bindings: watchdog: aspeed,ast2400-wdt: Add support for AST2700 Vince Chang
2026-10-29 5:08 ` [PATCH linux dev-6.18 2/4] watchdog: aspeed: Support variable number of reset mask registers Vince Chang
2026-10-29 5:08 ` Vince Chang [this message]
2026-10-29 5:08 ` [PATCH linux dev-6.18 4/4] watchdog: aspeed: Propagate errors from optional IRQ lookup Vince Chang
2026-10-29 23:59 ` [PATCH linux dev-6.18 0/4] Backport ASPEED AST2700 watchdog support Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261029050847.810331-4-vince_chang@aspeedtech.com \
--to=vince_chang@aspeedtech.com \
--cc=andrew@codeconstruct.com.au \
--cc=chin-ting_kuo@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=linux@roeck-us.net \
--cc=openbmc@lists.ozlabs.org \
--cc=tan.siewert@9elements.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.