From patchwork Mon Aug 19 05:17:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 171577 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2499691ily; Sun, 18 Aug 2019 22:17:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgXR9C44e92ek82KrULZyFKDYB1Zs50bdWqc8JM5auNbkCWdtN2cFNBO3QUrc3wD1jddGf X-Received: by 2002:a17:902:a714:: with SMTP id w20mr20391317plq.135.1566191877745; Sun, 18 Aug 2019 22:17:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566191877; cv=none; d=google.com; s=arc-20160816; b=PbPKbMEMI8KrJu4YrlWeFS9hwQeYNrKZQqvTc0MxVyO4UVhGVFMGjwGBP/YgSH2CT0 a53/9lO/h2/1xyiTFsZQ8OE1X8tf/pF+M8vqhhQTn+hPXmyWtkznM0lXYN5+OhPv0BbL GQpcrXVejCTZTTsLBXFHNRBOKbIpfxWT8/DD8B2s3f8cs03LYYrvnaPjyfQmvcYfp3Mv QdSrPHpGakp7wt+fiKhquR5vnckV6KmiQLhGkNRQAcQGbqiUagwyzg8IICKOYzby8ZF0 iwtUajIzx1Urw5GmPUZK7brBVeCDmj6nGHcCV4GWhULWWM4KQezh7QIxRFOdlKx+8U0s gziQ== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DyOkWXbip/sFDtzCMcgt9fKortz6cn0pIstBPgx8f+A=; b=gXZD1ykEEfdbfC7VmZqavg/G4C1wulKI0Yf9YuM2MEfurh80U/aCjocw38g/9wwvKk q0qXN8IC0rQJBZ3Yd35SUwUnrLOL5AutLqSKfdYU+VdLw3m84a/a21h9h4HAtVkPrLPi cNnqnXmyaq3IQbBZ+Ai0KJ15SsIEATrjvkTb9lgPB/pOb7JBRTfNqUH5sOzdbW0nPaTe CDDoCn7R9RKsjEhVDvbcnNtq74MD1QdCTkGVGMRmkoXW38QE4tjYuq29zvPI21rNCNbY VZrYBfkECrC4lKnlsgjuexFaFYBT4Mz7yg5qttTfyUBmmy7iVBfuNeqa2N43PlfOV+K9 DkmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Wa4gXkpp; spf=pass (google.com: best guess record for domain of linux-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-watchdog-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 v24si9160453pgn.64.2019.08.18.22.17.57 for ; Sun, 18 Aug 2019 22:17:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-watchdog-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=Wa4gXkpp; spf=pass (google.com: best guess record for domain of linux-watchdog-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-watchdog-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbfHSFR5 (ORCPT ); Mon, 19 Aug 2019 01:17:57 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:38956 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725768AbfHSFR5 (ORCPT ); Mon, 19 Aug 2019 01:17:57 -0400 Received: by mail-pf1-f196.google.com with SMTP id f17so459135pfn.6; Sun, 18 Aug 2019 22:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DyOkWXbip/sFDtzCMcgt9fKortz6cn0pIstBPgx8f+A=; b=Wa4gXkppzwM0+r04OH6+s7lLvWAhrUF/5j+fyU8uox4gov+ZJgzHhjmS2Crg475wh6 68fYVRmc09jA4Dt4DUHcmv7z3UY5O0jDLHnoffxGIO6RMhray7o9zzx1tC4XSJmKckfV Hjj53K0p3SiK5nJUfmDDzsy7egJ4dIKXoRs+7XyUHgv4bXyygwYHd+uclWOlihp7j/3B wnxMbOPM/xDiv41AqwKcsgUcvD4hq+BbLf1dpSixl9G9UNA+A0kXpREoWFiFqgqA7KJ8 GNCYMEn88qAvZMIXVBKT4CK/y8vH+tgaLYq77mLsLH4VULjISsY0i6qEQaHEJ3KA3Q5G MiHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DyOkWXbip/sFDtzCMcgt9fKortz6cn0pIstBPgx8f+A=; b=mVFYnj1jttMDjPnd1b3TwIuusbLdrsV3qFSpK+qRk41j+O2okdy5dBjZs9spqhm3qO sE8uWBc5xMjjCGJLYgT1R7FVG9jDOVbZ82FcWl9CHkTNzOknrRqfLXk1j22kJTiUVk5A bYrs4Giv+IvLoXpmkZAUn7gdrCA68UTk86TveZ9mEbB1e+MDmZwyC0+KauqtRTPGRYEv sxbCjw6+wwFnNRvEkfzG8eHo7QiErJSGkYwqGE5nzswQn3nCy/AfP2y9iV5bGU8cAL3W MYLMWMg8ViSdLAaytJcfp9nRvIJuibmmN61RVaYvlC3qHctpQE1OV6eowc7tLOgMT9Ho IxYA== X-Gm-Message-State: APjAAAVxWMjYDpoAh2kbZfpfEpldxyczR7YXoaWyPiftP0uht+hIankU 9q5XoHiYjR027S2mPU0B5Dw= X-Received: by 2002:a65:528d:: with SMTP id y13mr18906968pgp.120.1566191876456; Sun, 18 Aug 2019 22:17:56 -0700 (PDT) Received: from voyager.ibm.com ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id o3sm19010087pje.1.2019.08.18.22.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 22:17:55 -0700 (PDT) From: Joel Stanley To: Wim Van Sebroeck , Guenter Roeck , Rob Herring Cc: Ryan Chen , Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 2/2] watchdog: aspeed: Add support for AST2600 Date: Mon, 19 Aug 2019 14:47:38 +0930 Message-Id: <20190819051738.17370-3-joel@jms.id.au> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190819051738.17370-1-joel@jms.id.au> References: <20190819051738.17370-1-joel@jms.id.au> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Ryan Chen The ast2600 can be supported by the same code as the ast2500. Signed-off-by: Ryan Chen Signed-off-by: Joel Stanley --- v2: Reuse ast2500 config structure --- drivers/watchdog/aspeed_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.23.0.rc1 Reviewed-by: Guenter Roeck diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..5b64bc2e8788 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -34,6 +34,7 @@ static const struct aspeed_wdt_config ast2500_config = { static const struct of_device_id aspeed_wdt_of_table[] = { { .compatible = "aspeed,ast2400-wdt", .data = &ast2400_config }, { .compatible = "aspeed,ast2500-wdt", .data = &ast2500_config }, + { .compatible = "aspeed,ast2600-wdt", .data = &ast2500_config }, { }, }; MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); @@ -259,7 +260,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) set_bit(WDOG_HW_RUNNING, &wdt->wdd.status); } - if (of_device_is_compatible(np, "aspeed,ast2500-wdt")) { + if ((of_device_is_compatible(np, "aspeed,ast2500-wdt")) || + (of_device_is_compatible(np, "aspeed,ast2600-wdt"))) { u32 reg = readl(wdt->base + WDT_RESET_WIDTH); reg &= config->ext_pulse_width_mask;