[v2,2/2] watchdog: aspeed: Add support for AST2600

Message ID 20190819051738.17370-3-joel@jms.id.au
State New
Headers show
Series
  • watchdog: aspeed: Add support for ast2600
Related show

Commit Message

Joel Stanley Aug. 19, 2019, 5:17 a.m.
From: Ryan Chen <ryan_chen@aspeedtech.com>


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>

---
v2:
 Reuse ast2500 config structure
---
 drivers/watchdog/aspeed_wdt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.23.0.rc1

Comments

Guenter Roeck Aug. 20, 2019, 3:50 p.m. | #1
On Mon, Aug 19, 2019 at 02:47:38PM +0930, Joel Stanley wrote:
> From: Ryan Chen <ryan_chen@aspeedtech.com>

> 

> 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>


> ---

> v2:

>  Reuse ast2500 config structure

> ---

>  drivers/watchdog/aspeed_wdt.c | 4 +++-

>  1 file changed, 3 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c

> index cc71861e033a..5b64bc2e8788 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;

Patch

diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index cc71861e033a..5b64bc2e8788 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;