From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751960AbdF0CRp (ORCPT ); Mon, 26 Jun 2017 22:17:45 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38272 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751456AbdF0CRg (ORCPT ); Mon, 26 Jun 2017 22:17:36 -0400 Subject: Re: [2/2] drivers/watchdog: ASPEED reference dev tree properties for config To: Guenter Roeck References: <20170613203818.17399-3-cbostic@linux.vnet.ibm.com> <20170624221747.GA10038@roeck-us.net> Cc: wim@iguana.be, joel@jms.id.au, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, andrew@aj.id.au From: Christopher Bostic Date: Mon, 26 Jun 2017 21:17:25 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170624221747.GA10038@roeck-us.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17062702-2213-0000-0000-000001E8E591 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007283; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000214; SDB=6.00879215; UDB=6.00438177; IPR=6.00659369; BA=6.00005443; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015963; XFM=3.00000015; UTC=2017-06-27 02:17:33 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17062702-2214-0000-0000-000056A7EE02 Message-Id: <222152c4-a014-703c-29a0-a2a9ffdec5e9@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-26_18:,, 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-1706270034 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/24/17 5:17 PM, Guenter Roeck wrote: > On Tue, Jun 13, 2017 at 03:38:18PM -0500, Christopher Bostic wrote: >> 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; >> + > Please use of_property_read_bool(). Also, checking np for NULL is unnecessary > since the called function does that. Note that the above code as written is > wrong - if np is NULL, WDT_CTRL_RESET_SYSTEM will no longer be set. Will make the suggested changes. Thanks -Chris > The new properties should probably start with "aspeed," but I'll leave that > up to DT maintainers to decide. > >> + 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);