Message ID | 1596004249-28655-4-git-send-email-crystal.guo@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=Rbxa=BI=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26CFA138C for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 29 Jul 2020 06:43:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2E4B20809 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 29 Jul 2020 06:43:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nYNwN67S"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ujOkxuaa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2E4B20809 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=RNTQ1sjh1PHoPtjegN44RDHztbriMVEjxkwe3f/t46A=; b=nYNwN67SmgMQe9VCqNySW5t52 EmXHMLPGVdxU/cH0BZdF/tf8CbkD5nXqxK8o8z0OSITjZnc+nn83stYtHaxPZBA2EnLZY5/Eu7BoU xtnTxB+KikHKPCdjwes8AGTMcpKS4yyhrCp1oek8q2iuNmt1gLjA35n3GTQmXYuoUEu8An02YAvBe gZZ+up1d+Sd7QXPAvi1hGE7vYylyjdXYmGCVg7453cO1S+Uo+AcbZi+NqE8EP/lMHAxVhujwh306J X0tOEQ2rlNSaJ8p+zxLHN06N+8C2AZgu9mdePKhomlaBcmWKavoiC3F0vzucy5coyY7033yg9uIh1 Tu7UE9Ecg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0fmO-0003Tn-Ss; Wed, 29 Jul 2020 06:41:32 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0fmK-0003S1-GH; Wed, 29 Jul 2020 06:41:31 +0000 X-UUID: 752bbab902904872991f8a3bc2d0119b-20200728 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=BdJ2r7/FoQTlh/kyQIChiopClhLjq/Zo9T1MCUvBGSY=; b=ujOkxuaaFzS5pxa5T+ahY3/pNAxY5y5qTy8w0N2AZfsgIo+Dmftp3b5zXPrb4dCzuYlrN/HejxVlEz3E4GQaY/XXwGDTrN6Rxqb1JkA/wlL/GbK+QY0TCZZP611nBDg1+DwiRmv/0h5W+96erCDHFZaqGEPndL+fN0utH1mhZko=; X-UUID: 752bbab902904872991f8a3bc2d0119b-20200728 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from <crystal.guo@mediatek.com>) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 890166875; Tue, 28 Jul 2020 22:41:24 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Jul 2020 23:31:23 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 29 Jul 2020 14:31:21 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jul 2020 14:31:22 +0800 From: Crystal Guo <crystal.guo@mediatek.com> To: <linux@roeck-us.net>, <robh+dt@kernel.org>, <matthias.bgg@gmail.com> Subject: [v3, 3/3] watchdog: mtk_wdt: merge all the reset numbers in one head file Date: Wed, 29 Jul 2020 14:30:49 +0800 Message-ID: <1596004249-28655-4-git-send-email-crystal.guo@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1596004249-28655-1-git-send-email-crystal.guo@mediatek.com> References: <1596004249-28655-1-git-send-email-crystal.guo@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_024128_700441_40393E80 X-CRM114-Status: GOOD ( 13.72 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: linux-watchdog@vger.kernel.org, srv_heupstream@mediatek.com, seiya.wang@mediatek.com, erin.lo@mediatek.com, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Crystal Guo <crystal.guo@mediatek.com>, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org |
Series |
mtk_wdt: merge all the reset numbers in one head file
|
expand
|
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index d6a6393..5000a49 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -9,8 +9,7 @@ * Based on sunxi_wdt.c */ -#include <dt-bindings/reset-controller/mt2712-resets.h> -#include <dt-bindings/reset-controller/mt8183-resets.h> +#include <dt-bindings/reset-controller/mtk-resets.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/init.h>
mt8xxx-resets.h actually just used to define TOPRGU_SW_RST_NUM. Instead of resubmit a new mt8xxx-reset.h for a new IC, merge all the reset numbers in one head file. Signed-off-by: Crystal Guo <crystal.guo@mediatek.com> --- drivers/watchdog/mtk_wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)