From patchwork Mon Aug 19 05:17:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 11100259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D613E14F7 for ; Mon, 19 Aug 2019 05:17:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C682428562 for ; Mon, 19 Aug 2019 05:17:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB0F728564; Mon, 19 Aug 2019 05:17:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CD3928562 for ; Mon, 19 Aug 2019 05:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725871AbfHSFRx (ORCPT ); Mon, 19 Aug 2019 01:17:53 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43747 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725768AbfHSFRx (ORCPT ); Mon, 19 Aug 2019 01:17:53 -0400 Received: by mail-pf1-f194.google.com with SMTP id v12so453449pfn.10; Sun, 18 Aug 2019 22:17:52 -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=POHZpkPS//I34g8k/kk1/SY7LDbqKnT8nCOMJuIUBXw=; b=WtevONa4TaRG1SGxKo/EbUBePcgV7qdbDsZVbPt+gX0TR7SyAOHFQCmO1MUpuucFa6 TEJ5/9ZywOrayfT8oTxrLOu5X/U4s2fKDA7gFzsQbzXzCyeiDYFOGMk5EAtIy7Tn0lai 5Ah4eHo5QIJlnY3qsAeRMtcfubHa/DEhdAClxLSe9wPQdxTeJRGeZ5SnYAuVTE8eTuBh LCdwmMygIKcdcP+qL2BIfmHYU6O/Om3aS9tdOfKT6FCeVkPdEQ1RhM1DEszu7Syrk9/2 M281Ewo3LADwRtWHC+BXJDJg/vE4RupoTKtfDFdYdUkz5pLMpApYO5FFTZ9vQXvJ+UJB FLXg== 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=POHZpkPS//I34g8k/kk1/SY7LDbqKnT8nCOMJuIUBXw=; b=Y9io+Je8p5ie/5lQiwtvfUu1UtEtZY1XFX6OBmwBeYuToy6X9vwGEnrspINObfIye1 bkDZ5PYde96Y7mXpLbjHD12JZQp5Poj1DMfXDAp+iOZawOhPud5DMGaWNjZaY+GGuw7q mcADUj9CHRrkqjyxCw8+6BSFx6i0jf3qyqbN6KcamhipcDOaRDxhIb65fdmtgNKpm0aG aKUXc5jmQn+gqBl6c0BPmUNCrhjscJYNPWo2qmXSiPEhEcmnY1c7bT+egEvDW5tg6Zp2 xAzcn/bBXGEIa1WmTzrO+MbEalw3onHr42sDzVluOeuaHTH3NIaRXLXCYdIGJhlzAmF9 eOnw== X-Gm-Message-State: APjAAAWNOPrHNbiR9Ea9wdnhE8inQbzU1iir9pHWWThAACmNOJNh1Cyp M66ks94dxUVwUOTJNTf/Skk= X-Google-Smtp-Source: APXvYqx6I6EneoR0da6GR47cQfcPZWPNtpv7IgXI6pONXzKvyKww67S/CudJMaSqD+o3Gg0Lox1VzQ== X-Received: by 2002:a17:90a:bb0c:: with SMTP id u12mr19430107pjr.132.1566191872230; Sun, 18 Aug 2019 22:17:52 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 22:17:51 -0700 (PDT) From: Joel Stanley To: Wim Van Sebroeck , Guenter Roeck , Rob Herring Cc: Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, Ryan Chen Subject: [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible Date: Mon, 19 Aug 2019 14:47:37 +0930 Message-Id: <20190819051738.17370-2-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 X-Virus-Scanned: ClamAV using ClamSMTP This adds a compatible for the ast2600, a new ASPEED SoC. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery Reviewed-by: Rob Herring Reviewed-by: Guenter Roeck --- v2: - Add Andrew's r-b --- Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt index c5077a1f5cb3..d78d4a8fb868 100644 --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt @@ -4,6 +4,7 @@ Required properties: - compatible: must be one of: - "aspeed,ast2400-wdt" - "aspeed,ast2500-wdt" + - "aspeed,ast2600-wdt" - reg: physical base address of the controller and length of memory mapped region 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: 11100261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5EBA314F7 for ; Mon, 19 Aug 2019 05:17:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BBA628562 for ; Mon, 19 Aug 2019 05:17:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C97828564; Mon, 19 Aug 2019 05:17:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A917428562 for ; Mon, 19 Aug 2019 05:17:57 +0000 (UTC) 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-Google-Smtp-Source: APXvYqxmKIFDHCNwPUL7Pa2AYZQ57N6+X/NXdnMruTHlp+98Fjja2C1q0M4BwqahIM1AvA03PmrVSw== 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 X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Guenter Roeck --- v2: Reuse ast2500 config structure --- drivers/watchdog/aspeed_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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;