Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp2585005ybx; Fri, 8 Nov 2019 06:28:35 -0800 (PST) X-Google-Smtp-Source: APXvYqz7M4UxS1EDQT8yx1HejXlibQgO9DwDzJUWuoQ2DvtUGByKgBzP+nr+RVpSr4K8IKfrSbSF X-Received: by 2002:a17:906:52c3:: with SMTP id w3mr9175326ejn.122.1573223315491; Fri, 08 Nov 2019 06:28:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573223315; cv=none; d=google.com; s=arc-20160816; b=a04dFuebDGh1zGXMdcPfmreZ1mqQUY+P5NQjK1sj65laCMA8JsTv2yHai0IoIXI3ZN uhK1jpKWsL8LGzCrFqnSI5I4Fc/f1H+C4AJO25cGGbTXWeWMGxdNhhfwV9EGYLvrOIb5 nQoW6wC7d++y5z+9USIAwMc+/+SXc3WybV5CjXCsUnh8NQiKp2V6EdBvcJu5RtZLnZjI 2hcyuas2z6KFtTPXKQDmpQh+1fn61KGEjQfFPT3/s4d95Uf+zTCR/DtkIbFsUTIrJndx ZP+i33zeWbjZdq73yKALOD4DllFLBh4dPYvV5K40BafnTtD4l9rYI4Pg8F9eg1nVvBBG w9Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=2QPC8QnLvdDe0xE5A31AT6LtAT7sdxDY8gfcrh4eodY=; b=0cF9/A3DJ7DeDqEZLXybHDDASvezSFAqWhx1MkTZCxKHMPkLH8TzMDXSij4hKN0YZ2 96Bk90wAIkAvf3hRlZyyo0eiLwjYf4uD3A5BjavmWI1GUHdaKPECUKaZWh1gXDbhvgdS L8uB3o1Kt7yGApfy9nitX2GGBbPA/SlVodUl0FYe48rgpI1wZTkCb0RmLZmKdWDUP1ph MgVMc1Ck4308lCiiTQXXTOsAUajCwyXmI0u6nj/jeWUtlilVkcwoh1CJJlr1Le84WQzs l73ruTqna548XgpsxgJ1+WAz2AkuGvdd/mcgWzaapk27YYMIx4Yu2rfGMdmq35QcikBZ ztqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MeMYs8yF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s12si3514130eja.47.2019.11.08.06.28.11; Fri, 08 Nov 2019 06:28:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=MeMYs8yF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727001AbfKHOZI (ORCPT + 99 others); Fri, 8 Nov 2019 09:25:08 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36272 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbfKHOZH (ORCPT ); Fri, 8 Nov 2019 09:25:07 -0500 Received: by mail-pf1-f195.google.com with SMTP id v19so4688154pfm.3; Fri, 08 Nov 2019 06:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=2QPC8QnLvdDe0xE5A31AT6LtAT7sdxDY8gfcrh4eodY=; b=MeMYs8yFEuniNnvauAknagNHFZeN4tBHxXi5NvT/F5Mm+4ANQO0gLGN36OijIBL4U0 VgWur1KJ1tkOzo15JLqCylVrw/VcOOocPxhGPvJ76blM+SUdL7QYTN4LkK1VAF9I1hUb zXtRTdBZkUPMQISS5tJW155CDGXvUnJlKOV4MYXk4VMVuqcBVfh6kYmsnt963S16tuSj J99keTacAUtKqeqVvGK0jXjXg38lQAJ0chytk8U1/0xgWu+OSXFdga4/+9uX6xaS99GV B07/MfD8pHf4wOqypNtrufgvu+EnqrZXj65MNYwr+iqMjKnRqjN0wQYt+gUT4iXkz8ly 08GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=2QPC8QnLvdDe0xE5A31AT6LtAT7sdxDY8gfcrh4eodY=; b=ZqsG3WwJtNmWjfOzRsiq+NsqLeJyhawoiKvK1BV0g+UMKKAI3R7mvJ/Rvk2W4CnzY0 SpqoXQnHg4y5XKo39mGjRL0wJG6dRwK7pc5vNMZTpsVuFC49JS6KG+41Z2eU6abUwrTd xKLMMG+S7F71F5T9/AlIdhikYtHzGSsQpwe3W+Yjx5kKRplZ1WMHMV+GMAx4du2FlcYq F7hKzjlItDXGyjyxXJjbqjguolSTLYWiNlJbat5xBVXLWg1oLQBLqEdcDmZje3XA63Qa 37sDZLbxbxOpH89QbxON50BAkAb8vFJn97/QPONkWTJ6qQphldr32Sz60F/oltQ/0ewe 2KgQ== X-Gm-Message-State: APjAAAUcA7NPSE/RIXE9xxu3mET8rzWzQLEB3rqFWUtqxmY5YyeFsf7H 4eM99wv4lyS+2V/uopMVwV90bB8d X-Received: by 2002:a65:41c5:: with SMTP id b5mr12021246pgq.78.1573223106517; Fri, 08 Nov 2019 06:25:06 -0800 (PST) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id q199sm6075664pfq.147.2019.11.08.06.25.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Nov 2019 06:25:05 -0800 (PST) Subject: Re: [PATCH] watchdog: aspeed: Fix clock behaviour for ast2600 To: Joel Stanley , Wim Van Sebroeck , linux-watchdog@vger.kernel.org Cc: Andrew Jeffery , Ryan Chen , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org References: <20191108032905.22463-1-joel@jms.id.au> From: Guenter Roeck Message-ID: <74f32d61-856d-623f-2f37-965d9331aba0@roeck-us.net> Date: Fri, 8 Nov 2019 06:25:04 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191108032905.22463-1-joel@jms.id.au> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/7/19 7:29 PM, Joel Stanley wrote: > The ast2600 no longer uses bit 4 in the control register to indicate a > 1MHz clock (It now controls weather this watchdog is reset by a SOC > reset). This means we do not want to set it. It also does not need to be > set for the ast2500, as it is read-only on that SoC. > > The comment next to the clock rate selection wandered away from where it > was set, so put it back next to the register setting it's describing. > > Fixes: b3528b487448 ("watchdog: aspeed: Add support for AST2600") > Signed-off-by: Joel Stanley Reviewed-by: Guenter Roeck > --- > drivers/watchdog/aspeed_wdt.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c > index 4ec0906bf12c..7e00960651fa 100644 > --- a/drivers/watchdog/aspeed_wdt.c > +++ b/drivers/watchdog/aspeed_wdt.c > @@ -258,11 +258,6 @@ static int aspeed_wdt_probe(struct platform_device *pdev) > if (IS_ERR(wdt->base)) > return PTR_ERR(wdt->base); > > - /* > - * The ast2400 wdt can run at PCLK, or 1MHz. The ast2500 only > - * runs at 1MHz. We chose to always run at 1MHz, as there's no > - * good reason to have a faster watchdog counter. > - */ > wdt->wdd.info = &aspeed_wdt_info; > wdt->wdd.ops = &aspeed_wdt_ops; > wdt->wdd.max_hw_heartbeat_ms = WDT_MAX_TIMEOUT_MS; > @@ -278,7 +273,16 @@ static int aspeed_wdt_probe(struct platform_device *pdev) > return -EINVAL; > config = ofdid->data; > > - wdt->ctrl = WDT_CTRL_1MHZ_CLK; > + /* > + * 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 > + * > + * Set the ast2400 to run at 1MHz as it simplifies the driver. > + */ > + if (of_device_is_compatible(np, "aspeed,ast2400-wdt")) > + wdt->ctrl = WDT_CTRL_1MHZ_CLK; > > /* > * Control reset on a per-device basis to ensure the >