From: Christopher Bostic <cbostic@linux.vnet.ibm.com>
To: wim@iguana.be, linux@roeck-us.net, robh+dt@kernel.org,
mark.rutland@arm.com, joel@jms.id.au,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org
Cc: Christopher Bostic <cbostic@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] drivers/watchdog: ASPEED reference dev tree properties for config
Date: Tue, 27 Jun 2017 16:17:34 -0500 [thread overview]
Message-ID: <20170627211734.60477-3-cbostic@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170627211734.60477-1-cbostic@linux.vnet.ibm.com>
Reference the system device tree when configuring the watchdog
engines. Set external signal mode on timeout if specified.
Set system reset on timeout if specified.
Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com>
---
v2 - Change of_get_property() to of_property_read_bool()
- Remove redundant check for NULL struct device_node pointer
- Optional property names now start with prefix 'aspeed,'
---
drivers/watchdog/aspeed_wdt.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index 1c65258..71ce5f5 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -140,6 +140,7 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
{
struct aspeed_wdt *wdt;
struct resource *res;
+ struct device_node *np;
int ret;
wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
@@ -170,8 +171,16 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
* the SOC and not the full chip
*/
wdt->ctrl = WDT_CTRL_RESET_MODE_SOC |
- WDT_CTRL_1MHZ_CLK |
- WDT_CTRL_RESET_SYSTEM;
+ WDT_CTRL_1MHZ_CLK;
+
+ np = pdev->dev.of_node;
+ if (of_property_read_bool(np, "aspeed,sys-reset"))
+ wdt->ctrl |= WDT_CTRL_RESET_SYSTEM;
+
+ if (of_property_read_bool(np, "aspeed,external-signal"))
+ wdt->ctrl |= WDT_CTRL_WDT_EXT;
+
+ writel(wdt->ctrl, wdt->base + WDT_CTRL);
if (readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE) {
aspeed_wdt_start(&wdt->wdd);
--
1.8.2.2
next prev parent reply other threads:[~2017-06-27 21:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 21:17 [PATCH v2 0/2] Add ASPEED watchdog device tree properties Christopher Bostic
2017-06-27 21:17 ` [PATCH v2 1/2] drivers/watchdog: Add optional ASPEED " Christopher Bostic
2017-06-27 21:32 ` Guenter Roeck
2017-06-27 21:42 ` Christopher Bostic
2017-06-27 22:07 ` Guenter Roeck
2017-06-28 14:55 ` Christopher Bostic
2017-06-28 15:06 ` Guenter Roeck
2017-06-27 21:17 ` Christopher Bostic [this message]
2017-06-28 11:31 ` [PATCH v2 2/2] drivers/watchdog: ASPEED reference dev tree properties for config Guenter Roeck
2017-06-28 14:29 ` Christopher Bostic
2017-06-28 14:54 ` Guenter Roeck
2017-06-28 14:59 ` Christopher Bostic
2017-06-28 15:08 ` Guenter Roeck
2017-06-28 15:55 ` Christopher Bostic
2017-06-28 16:06 ` Guenter Roeck
2017-06-28 16:09 ` Christopher Bostic
2017-06-28 17:52 ` Guenter Roeck
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=20170627211734.60477-3-cbostic@linux.vnet.ibm.com \
--to=cbostic@linux.vnet.ibm.com \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=wim@iguana.be \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).