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: 11100267 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 4AE3414F7 for ; Mon, 19 Aug 2019 05:18:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35FA428562 for ; Mon, 19 Aug 2019 05:18:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28A5D28564; Mon, 19 Aug 2019 05:18:44 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C326C28562 for ; Mon, 19 Aug 2019 05:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NIZDhiChHLtru+FhIqBGc/BddiNej1/p7HAlLmvf100=; b=nCt3m5MylQvYnv N552377LR63ZaAIINF+HWKWu2rcVbetAoDvcFeZOXC0+ddur9vRVh8QBVKd7ndcoeEI7TJObYYdbN qRVMBX0gPoTJb48PgPgqb6JGtlE3CgnNyk4Sr1Jxhu1S0Ye+iMI1vabeKc3NAS50OCp4N9PcUjEcC c30AAiG6UFTWUtkMZY50tCp49W8OS3SSlg8+fwpf2dqIzNc4dKLl1F/OihlA1ZlJLGsaICU4M4osQ hQUvdrD83hQw4boVDq+zH3vhoXRyx3l28WIRdsS3mHlW6XEnGygYSa2AVbhXGRzZdYs9a5KYJzEw4 nQtMcmDTiyGVy530d8Jg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hza43-00037V-5H; Mon, 19 Aug 2019 05:18:43 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hza3J-0002j3-8l for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2019 05:17:58 +0000 Received: by mail-pg1-x543.google.com with SMTP id n9so488142pgc.1 for ; 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=uDM7+dZzhW85msKxQU3M5VYQXaps2NoCwCVloFvasN4LeXb+TvRv1UQh8ms/5BbCiB Cymm7+DSQFKkcPlUmrkBU7RRyE6VcozpRibCxNWKnzAO6uBHeozjGNLKpcJC3/ECL0r6 fLN/Cd/ahMb7VJekuMGSuSAyAkAp9smBeYGfWhluENL5KUmzlWNjdHtk+veYlymAfms7 U+BiYFENIRhnGJyh81/5/qUMF0oBiO7gGqZ3Vxl1sRezrJD8DZ392WADs4ZISQ5y/ZLn pRfIBrfv9EFSfhxufDYlmXuCMPwdFwO6saCgj22YhGnMN+1+Vi/l7skNVZc2W7xrSoBA k9og== X-Gm-Message-State: APjAAAXbvU3jT3Q35xW3cPp7PAlGvfxUl1pSNyqmYMUondpevFvF3E50 Y6+LzgXbg69pIXwWpDIAlj8= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190818_221757_422724_2B088873 X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Ryan Chen , linux-watchdog@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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;