From patchwork Fri Aug 16 16:03:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 11097965 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 11AE414F7 for ; Fri, 16 Aug 2019 16:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 007FF20008 for ; Fri, 16 Aug 2019 16:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E930E289B1; Fri, 16 Aug 2019 16:04:06 +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 D89E620008 for ; Fri, 16 Aug 2019 16:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727347AbfHPQEC (ORCPT ); Fri, 16 Aug 2019 12:04:02 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34242 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727391AbfHPQEC (ORCPT ); Fri, 16 Aug 2019 12:04:02 -0400 Received: by mail-pg1-f196.google.com with SMTP id n9so3169943pgc.1; Fri, 16 Aug 2019 09:04:02 -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=r15xV+pSvUz93fe9Op05lhHjyimxUmk5oIduSMlRE+A=; b=JdM3jUtPBbQDkLzajaWD6jVE6fQj4gee8v8Eq83IBHgZcKjyPv/AZVq0VfWEMLpYUQ ZU6Owvo1J9S2pYWi4Hj7r0IRGchjhlkbrAcRycGcOqE2tSCO2VJDafQFkENFH3S+hr4R NaP2/zKhUKJvM0EeoFAuqjvaI7HIkkF261RUkshtsqjDssYHnChk2sytsyKbouE9BDBO /IquPJrMBxpMKbqkED5JgbyKa/wIpC3upkER+sd60LpJM16bVxUQx/gvg6t7t5jPTtcE NGvPmyicV1wOycLhIfo8UiOvZ2sWmluaFGSD3IVmgPW08p2RJrAOpSsmvKEcFJuDxrHC Py5A== 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=r15xV+pSvUz93fe9Op05lhHjyimxUmk5oIduSMlRE+A=; b=d4AnS3sgQNB4VEHGbWK2aGBeY+d2QR0G/Iu0/Mznj+SZFQdxp84+PI1QNQTqj/RtG1 Z+uNoYoX7mpnx4oGS3qtVxtthNqEqKHy31NwnYlxLkRq6ShHqDzO+VwvUUfBYq996que +5U5CCpVUSCpTzXRUWJq0bZUdecHv/jNfg2NxT3AkKa6rwI6zkkBIYxxMnAbgVPR0Whc Cc2aYyLZUwujWo/l1rBHDHN30VkeVJ6bIcv+b7Sd047dr7xLv8rLsftlOoMuExw0xz90 KuzjFti1oHQJC+YcCfS6YF1kfFi8XhCqBtNARxG0QQMA2PXMo+54O93H6goNZ8eZw7E/ zQ8w== X-Gm-Message-State: APjAAAWaU5r0zzu3V1qXWWpLorC+5pKyDX0kIoy/CepH0gaSxTjWGj+L 3XpGCZbR7690gcCQaTYr/iM= X-Google-Smtp-Source: APXvYqw434z92KZltolLhjc/SLek9lgPRJMm0aZV+vDRBoG/RmT4CDXtcqHryvIT64ugBYXHYnqTuQ== X-Received: by 2002:a65:64c6:: with SMTP id t6mr8608739pgv.323.1565971441742; Fri, 16 Aug 2019 09:04:01 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id m20sm7578607pff.79.2019.08.16.09.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2019 09:04:01 -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 1/2] dt-bindings: watchdog: Add ast2600 compatible Date: Sat, 17 Aug 2019 01:33:46 +0930 Message-Id: <20190816160347.23393-2-joel@jms.id.au> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190816160347.23393-1-joel@jms.id.au> References: <20190816160347.23393-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 --- 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 Fri Aug 16 16:03:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 11097967 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 A475E18EC for ; Fri, 16 Aug 2019 16:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9210B20008 for ; Fri, 16 Aug 2019 16:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 862B9288F6; Fri, 16 Aug 2019 16:04:07 +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 08AFE289B2 for ; Fri, 16 Aug 2019 16:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727480AbfHPQEG (ORCPT ); Fri, 16 Aug 2019 12:04:06 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34558 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727391AbfHPQEG (ORCPT ); Fri, 16 Aug 2019 12:04:06 -0400 Received: by mail-pl1-f193.google.com with SMTP id d3so765588plr.1; Fri, 16 Aug 2019 09:04:06 -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=BrRMkjc2qGWCZLIX9694c7JW7Gvf0FMcBkwT0dY+kis=; b=hcp099JLXcAtr20hVTLWgVQYFXbhVo4XXLQW1gdi3X8wRO/iMDfVRxkZdA5NU7sAQh voXm3CvwWdBYwGJz329n7nQ8rE8+eLKw/vWJpi8Vovk6mb3R8BEURRIiFAo9gYUrP5OU bPQkYgp6sSWijbk+aWW8MqL9P2yCokXbfiOzbpgVJ/T3OaYnbYTg3JrwH0ELewheo8Op ArXIuD2xkn+/ugivUTwZGh4XmqUo89Feh6zy5EIJ6BvpS3OQ80lWi/FFPmDleMc4gu0g jBkFdbXQFne1ffs23n8Yt6XafDq894mNsogG9+FL7rU0hfCNzuDO2ClfSF8v/MYWG5/e AV1Q== 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=BrRMkjc2qGWCZLIX9694c7JW7Gvf0FMcBkwT0dY+kis=; b=j7yR5AqyJjqtrU5mCyQkQZ980SxNNEUrdfttTZN+q6WmwOQ2pJ7Dv8/SEf9neZuKFX V/vtUpt4KOysdswwcjKdfEMhuEDp+T42ctSeGiGLMRE7vTeQ8dfT/g952qECWRPMjTbZ G+uj+x2QH8bZ3H4HAxRlbcFSqTutnH9ZX8TmjZZ/KuBLiUgjACP6oF61k3BhsItJllpZ JVqBHkfXdUjCUW1G7t1pltt7HyP494U1IYhFlmf1ks1V5XfHcmM87hybdzl/I72i4Xlv 3bHYoRnEgCBh6oUhGWLlC1aGLwXrFMbeUuBu75fWqbARIbiHuYBhVpoIURXks0J28g41 LQ9w== X-Gm-Message-State: APjAAAWFk0cYIeQHJr0vudOJXblbP0beDOVQVZQLTJo5ZG8zkvcsB/h6 ng1rFQTzIY2aYOiHjIcnS38= X-Google-Smtp-Source: APXvYqxiGn8dbBBUwz6+A3QeDJEhGVLcHKlXkwSQ70P6UKBPE5EgJgZ0TGRQnwNFfsCB+8cciHU9ng== X-Received: by 2002:a17:902:a01:: with SMTP id 1mr10269948plo.278.1565971445900; Fri, 16 Aug 2019 09:04:05 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id m20sm7578607pff.79.2019.08.16.09.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2019 09:04:05 -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 2/2] watchdog: aspeed: Add support for AST2600 Date: Sat, 17 Aug 2019 01:33:47 +0930 Message-Id: <20190816160347.23393-3-joel@jms.id.au> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20190816160347.23393-1-joel@jms.id.au> References: <20190816160347.23393-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 --- drivers/watchdog/aspeed_wdt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..94f73796ba9d 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -31,9 +31,14 @@ static const struct aspeed_wdt_config ast2500_config = { .ext_pulse_width_mask = 0xfffff, }; +static const struct aspeed_wdt_config ast2600_config = { + .ext_pulse_width_mask = 0xfffff, +}; + 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 = &ast2600_config }, { }, }; MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); @@ -259,7 +264,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;