From patchwork Thu Oct 28 09:17:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1547381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=mliLb7Yz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hg0Mz2R72z9sRN for ; Thu, 28 Oct 2021 20:18:05 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mg1Xl-0006d2-Je; Thu, 28 Oct 2021 09:17:53 +0000 Received: from mail-pl1-f181.google.com ([209.85.214.181]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mg1Xj-0006cT-KI for kernel-team@lists.ubuntu.com; Thu, 28 Oct 2021 09:17:51 +0000 Received: by mail-pl1-f181.google.com with SMTP id p18so695570plf.13 for ; Thu, 28 Oct 2021 02:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6wRfZx2cmoGWuYrVgFRauWSnV5NU2nqUJhqNVCJpv1c=; b=mliLb7YzIjDZFGgQOSBM0+B3EYbSHybd+b/Ch+fWtvscSj9lh7ckp5Qq+dHwE+gwhx edtJmgiE79rxBzW9hiR9nI2mlPJaVsSj6eJ1duPgKlLFDz0kj31yoAv+FwH3+Uyo6b+C W2qTvPZySNcDjMNuvtbFEPbNWEqcL0f5jPfyeWaPZaBzPL225HF6qGWr6dypvAyKUi1v vmSynmfQTbFy4s5FrMBG2X4Ob8h7O6m5ImahMjyCgETDK1sXXgNt9r1PzwEfaBTNHSX5 EYOgrJYqYlVtsTmJczIC3OETN+N8zoaOKhDfvPPG+OWeZuGzJEtYOVob7F/TgbS2lMGf qReA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6wRfZx2cmoGWuYrVgFRauWSnV5NU2nqUJhqNVCJpv1c=; b=Orc1rmd3vzcVSxDwniTQZx6TXQZChrx+m0xUwZ8M2wb5QbECznkptUmeidlfbvhFQ9 dHX3ITrwGA1mFUGOdcTx+1AWznKIcB4+eX7+EzS0hLJ1dBlLwt/p6agB6PqCiGvvTmBZ 7RywHqLvySyccu/QJxi816zgv8L/C0diZejO1l+XlOOEq6kIEk9TD5jNI867mpDBeytq 1ifRrsQHUzatJDfwGlXvcxnECeS++F322ZegRgDGs8Ruyni5ZUSMtFFnlywpR0kKjkeO xKmBNM4kfzvOoSgpOaB9bvRu6zyNIKEuYWxs+N015WTNtFphJXbAgX8p7wnKQdQ/lMJp +THA== X-Gm-Message-State: AOAM5303quJhkuYaW0q8jNLmb/+UW3XPrELmOC6ci369i2KwbSJWCPKy yvKqT6yZ68wntQsLr9bLvgYp4zHk2e0= X-Google-Smtp-Source: ABdhPJw8OuZjh/Sg59PYxVG9ImtMi1RSxk++pS1BjatOOSNM5QVy66W8K2Piq2utYBVQ+Lp6b1R9DA== X-Received: by 2002:a17:902:e78f:b0:141:8bd3:8bcf with SMTP id cp15-20020a170902e78f00b001418bd38bcfmr1787271plb.56.1635412669316; Thu, 28 Oct 2021 02:17:49 -0700 (PDT) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id j11sm2882271pfj.40.2021.10.28.02.17.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 02:17:48 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][H][I][J/Unstable] UBUNTU: ODM: watchdog: f71808e_wdt: Add F81966 support Date: Thu, 28 Oct 2021 17:17:44 +0800 Message-Id: <20211028091744.762906-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028091744.762906-1-acelan.kao@canonical.com> References: <20211028091744.762906-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.181; envelope-from=acelan@gmail.com; helo=mail-pl1-f181.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: AaeonIot BugLink: https://bugs.launchpad.net/bugs/1949063 This adds watchdog support the Fintek F81966 Super I/O chip. Testing was done on the Aaeon SSE-OPTI Signed-off-by: AaeonIot Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/watchdog/f71808e_wdt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 drivers/watchdog/f71808e_wdt.c diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c old mode 100644 new mode 100755 index f60beec1bbae..0e009d167964 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -54,6 +54,7 @@ #define SIO_F81803_ID 0x1210 /* Chipset ID */ #define SIO_F81865_ID 0x0704 /* Chipset ID */ #define SIO_F81866_ID 0x1010 /* Chipset ID */ +#define SIO_F81966_ID 0x1502 /* F81804 chipset ID, same for f81966 */ #define F71808FG_REG_WDO_CONF 0xf0 #define F71808FG_REG_WDT_CONF 0xf5 @@ -111,7 +112,7 @@ MODULE_PARM_DESC(start_withtimeout, "Start watchdog timer on module load with" " given initial timeout. Zero (default) disables this feature."); enum chips { f71808fg, f71858fg, f71862fg, f71868, f71869, f71882fg, f71889fg, - f81803, f81865, f81866}; + f81803, f81865, f81866, f81966}; static const char *f71808e_names[] = { "f71808fg", @@ -124,6 +125,7 @@ static const char *f71808e_names[] = { "f81803", "f81865", "f81866", + "f81966" }; /* Super-I/O Function prototypes */ @@ -371,6 +373,7 @@ static int watchdog_start(void) break; case f81866: + case f81966: /* * GPIO1 Control Register when 27h BIT3:2 = 01 & BIT0 = 0. * The PIN 70(GPIO15/WDTRST) is controlled by 2Ch: @@ -397,7 +400,7 @@ static int watchdog_start(void) superio_select(watchdog.sioaddr, SIO_F71808FG_LD_WDT); superio_set_bit(watchdog.sioaddr, SIO_REG_ENABLE, 0); - if (watchdog.type == f81865 || watchdog.type == f81866) + if (watchdog.type == f81865 || watchdog.type == f81866 || watchdog.type == f81966) superio_set_bit(watchdog.sioaddr, F81865_REG_WDO_CONF, F81865_FLAG_WDOUT_EN); else @@ -820,6 +823,9 @@ static int __init f71808e_find(int sioaddr) case SIO_F81866_ID: watchdog.type = f81866; break; + case SIO_F81966_ID: + watchdog.type = f81966; + break; default: pr_info("Unrecognized Fintek device: %04x\n", (unsigned int)devid);