From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46E6AECE58E for ; Thu, 10 Oct 2019 08:54:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 171722064A for ; Thu, 10 Oct 2019 08:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697641; bh=gT/n4oqc6OGEqUUO2qysr1qAGttbCYzxG2DAiUEliRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tpQ7SfdBWKKC1wBtAnwZhGNaCEXX7P9p4GE8TV9KPGzTzGhLVMOmPL/2tEA9a04q/ FUjtNdKuvT07+UGHuu7FdGYFw/r+0Ztoro1rfkswjDlDeOVqhR8IqupB1fv39TDwPJ xqzIAMRKG07iC8+AR4DMaIaPQNLxlPGIgHrHNnMo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390029AbfJJIu4 (ORCPT ); Thu, 10 Oct 2019 04:50:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389631AbfJJIuz (ORCPT ); Thu, 10 Oct 2019 04:50:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BDF32190F; Thu, 10 Oct 2019 08:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697454; bh=gT/n4oqc6OGEqUUO2qysr1qAGttbCYzxG2DAiUEliRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uFt3PLnPUg1jwwTaJExPsgYsxWZBs5sX5SCN5y1PIx4vcJbXwN1zdO/vG9S7IKVCw da+6KIXT7XoDyA5AmwzNQqeXkD7Kj+UbzlONtH4uVb3zWCtawX1E3GjkHfX3RVthVz WS3Q+BRJsIWnh67dxCQa7BeWzPvif6Hz35PhoVlk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryan Chen , Joel Stanley , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 4.14 34/61] watchdog: aspeed: Add support for AST2600 Date: Thu, 10 Oct 2019 10:36:59 +0200 Message-Id: <20191010083511.720058544@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083449.500442342@linuxfoundation.org> References: <20191010083449.500442342@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ryan Chen [ Upstream commit b3528b4874480818e38e4da019d655413c233e6a ] 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 Link: https://lore.kernel.org/r/20190819051738.17370-3-joel@jms.id.au Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- 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 fd91007b4e41b..cee7334b2a000 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -38,6 +38,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); @@ -257,7 +258,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; -- 2.20.1