Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905AbdFMUjS (ORCPT ); Tue, 13 Jun 2017 16:39:18 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41883 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753646AbdFMUjR (ORCPT ); Tue, 13 Jun 2017 16:39:17 -0400 From: Christopher Bostic To: wim@iguana.be, linux@roeck-us.net Cc: Christopher Bostic , joel@jms.id.au, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, andrew@aj.id.au Subject: [PATCH 2/2] drivers/watchdog: ASPEED reference dev tree properties for config Date: Tue, 13 Jun 2017 15:38:18 -0500 X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170613203818.17399-1-cbostic@linux.vnet.ibm.com> References: <20170613203818.17399-1-cbostic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17061320-0016-0000-0000-000006F5194B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007226; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000212; SDB=6.00874329; UDB=6.00435204; IPR=6.00654417; BA=6.00005420; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015811; XFM=3.00000015; UTC=2017-06-13 20:38:41 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061320-0017-0000-0000-00003A1968DD Message-Id: <20170613203818.17399-3-cbostic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-13_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706130351 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1575 Lines: 46 Reference the system device tree when configuring the watchdog. Configure for external signal generation if optional attribute 'external-signal' is present in device tree. Configure for reset system after timeout if the optional attribute 'no-system-reset' is not present. Disabling system reset may be required in situations where one of the other watchdogs in the systems is responsible for this. Signed-off-by: Christopher Bostic --- 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..9deb4be 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 (np && !of_get_property(np, "no-system-reset", NULL)) + wdt->ctrl |= WDT_CTRL_RESET_SYSTEM; + + if (np && of_get_property(np, "external-signal", NULL)) + 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