diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch index 3f71219de..33e142c30 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0116-watchdog-aspeed-fix-AST2600-support.patch @@ -1,31 +1,50 @@ -From f911c7c994bf57685254f3b92e03e999d9cf058a Mon Sep 17 00:00:00 2001 +From 02acccc7dd2ade8cf48aff2312ebb8752c8c98eb Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Thu, 25 Jun 2020 23:56:15 -0700 Subject: [PATCH] watchdog: aspeed: fix AST2600 support AST2600 provides different function of WDT0C[4] and it doesn't -provides WDT10[1] so this commit fixes driver to make it don't -use these register bits in case of AST2600. +provides WDT10[1] so this commit fixes driver to make it available +on AST2600. Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> --- - drivers/watchdog/aspeed_wdt.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + drivers/watchdog/aspeed_wdt.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c -index 7e00960651fa..5a74b439e3b1 100644 +index 7e00960651fa..b0afeb939686 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c -@@ -279,6 +279,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) +@@ -47,7 +47,8 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); + #define WDT_CTRL_RESET_MODE_SOC (0x00 << 5) + #define WDT_CTRL_RESET_MODE_FULL_CHIP (0x01 << 5) + #define WDT_CTRL_RESET_MODE_ARM_CPU (0x10 << 5) +-#define WDT_CTRL_1MHZ_CLK BIT(4) ++#define WDT_CTRL_1MHZ_CLK BIT(4) /* ast2400/2500 */ ++#define WDT_CTRL_WDT_RST_BY_SOC_RST BIT(4) /* ast2600 */ + #define WDT_CTRL_WDT_EXT BIT(3) + #define WDT_CTRL_WDT_INTR BIT(2) + #define WDT_CTRL_RESET_SYSTEM BIT(1) +@@ -277,12 +278,15 @@ static int aspeed_wdt_probe(struct platform_device *pdev) + * On clock rates: + * - ast2400 wdt can run at PCLK, or 1MHz * - ast2500 only runs at 1MHz, hard coding bit 4 to 1 - * - ast2600 always runs at 1MHz +- * - ast2600 always runs at 1MHz ++ * - ast2600 uses WDT0C[4] as 'Enable WDT to be reset by SOC reset' * -+ * Note: ast2600 uses WDT0C[4] as 'Enable WDT to be reset by SOC reset' -+ * * Set the ast2400 to run at 1MHz as it simplifies the driver. */ - if (of_device_is_compatible(np, "aspeed,ast2400-wdt")) -@@ -367,13 +369,12 @@ static int aspeed_wdt_probe(struct platform_device *pdev) +- if (of_device_is_compatible(np, "aspeed,ast2400-wdt")) ++ if (of_device_is_compatible(np, "aspeed,ast2400-wdt") || ++ of_device_is_compatible(np, "aspeed,ast2500-wdt")) + wdt->ctrl = WDT_CTRL_1MHZ_CLK; ++ else if (of_device_is_compatible(np, "aspeed,ast2600-wdt")) ++ wdt->ctrl = WDT_CTRL_WDT_RST_BY_SOC_RST; + + /* + * Control reset on a per-device basis to ensure the +@@ -367,13 +371,12 @@ static int aspeed_wdt_probe(struct platform_device *pdev) writel(duration - 1, wdt->base + WDT_RESET_WIDTH); } @@ -45,5 +64,5 @@ index 7e00960651fa..5a74b439e3b1 100644 dev_set_drvdata(dev, wdt); -- -2.7.4 +2.17.1 |