From nobody Tue Dec 16 16:41:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09146C4167B for ; Sat, 9 Dec 2023 14:28:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231150AbjLIO2E convert rfc822-to-8bit (ORCPT ); Sat, 9 Dec 2023 09:28:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjLIO16 (ORCPT ); Sat, 9 Dec 2023 09:27:58 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB1B210E0; Sat, 9 Dec 2023 06:28:01 -0800 (PST) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 13BC824DFCE; Sat, 9 Dec 2023 22:27:59 +0800 (CST) Received: from EXMBX072.cuchost.com (172.16.6.82) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Sat, 9 Dec 2023 22:27:58 +0800 Received: from localhost.localdomain (202.188.176.82) by EXMBX072.cuchost.com (172.16.6.82) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Sat, 9 Dec 2023 22:27:53 +0800 From: Ji Sheng Teoh To: Xingyu Wu , Samin Guo , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Ji Sheng Teoh , Ley Foon Tan , , , Subject: [PATCH v1 1/2] watchdog: starfive-wdt: Add JH8100 watchdog compatible string Date: Sat, 9 Dec 2023 22:27:22 +0800 Message-ID: <20231209142723.2060196-2-jisheng.teoh@starfivetech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231209142723.2060196-1-jisheng.teoh@starfivetech.com> References: <20231209142723.2060196-1-jisheng.teoh@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX072.cuchost.com (172.16.6.82) X-YovoleRuleAgent: yovoleflag Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add "starfive,jh8100-wdt" compatible for StarFive's JH8100 watchdog. JH8100 watchdog reuses JH7110 register mapping. Signed-off-by: Ley Foon Tan Signed-off-by: Ji Sheng Teoh Reviewed-by: Guenter Roeck --- drivers/watchdog/starfive-wdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wd= t.c index 5f501b41faf9..31785bb373d5 100644 --- a/drivers/watchdog/starfive-wdt.c +++ b/drivers/watchdog/starfive-wdt.c @@ -581,6 +581,7 @@ static const struct dev_pm_ops starfive_wdt_pm_ops =3D { static const struct of_device_id starfive_wdt_match[] =3D { { .compatible =3D "starfive,jh7100-wdt", .data =3D &starfive_wdt_jh7100_v= ariant }, { .compatible =3D "starfive,jh7110-wdt", .data =3D &starfive_wdt_jh7110_v= ariant }, + { .compatible =3D "starfive,jh8100-wdt", .data =3D &starfive_wdt_jh7110_v= ariant }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, starfive_wdt_match); --=20 2.25.1 From nobody Tue Dec 16 16:41:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94031C10F07 for ; Sat, 9 Dec 2023 14:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230430AbjLIO2A convert rfc822-to-8bit (ORCPT ); Sat, 9 Dec 2023 09:28:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbjLIO16 (ORCPT ); Sat, 9 Dec 2023 09:27:58 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB37310E7; Sat, 9 Dec 2023 06:28:04 -0800 (PST) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id B9A6524E03E; Sat, 9 Dec 2023 22:28:03 +0800 (CST) Received: from EXMBX072.cuchost.com (172.16.6.82) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Sat, 9 Dec 2023 22:28:03 +0800 Received: from localhost.localdomain (202.188.176.82) by EXMBX072.cuchost.com (172.16.6.82) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Sat, 9 Dec 2023 22:27:59 +0800 From: Ji Sheng Teoh To: Xingyu Wu , Samin Guo , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Ji Sheng Teoh , Ley Foon Tan , , , Subject: [PATCH v1 2/2] dt-bindings: watchdog: starfive,jh7100-wdt: Add compatible for JH8100 Date: Sat, 9 Dec 2023 22:27:23 +0800 Message-ID: <20231209142723.2060196-3-jisheng.teoh@starfivetech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231209142723.2060196-1-jisheng.teoh@starfivetech.com> References: <20231209142723.2060196-1-jisheng.teoh@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX072.cuchost.com (172.16.6.82) X-YovoleRuleAgent: yovoleflag Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100 watchdog. Since JH8100 watchdog only has 1 reset signal, update binding document to support one reset for "starfive,jh8100-wdt" compatible. Signed-off-by: Ley Foon Tan Signed-off-by: Ji Sheng Teoh --- .../watchdog/starfive,jh7100-wdt.yaml | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt= .yaml b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml index 68f3f6fd08a6..eec182317219 100644 --- a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml @@ -19,14 +19,12 @@ description: isn't cleared, the watchdog will reset the system unless the watchdog reset is disabled. =20 -allOf: - - $ref: watchdog.yaml# - properties: compatible: enum: - starfive,jh7100-wdt - starfive,jh7110-wdt + - starfive,jh8100-wdt =20 reg: maxItems: 1 @@ -44,11 +42,6 @@ properties: - const: apb - const: core =20 - resets: - items: - - description: APB reset - - description: Core reset - required: - compatible - reg @@ -56,6 +49,26 @@ required: - clock-names - resets =20 +allOf: + - $ref: watchdog.yaml# + - if: + properties: + compatible: + contains: + enum: + - starfive,jh8100-wdt + then: + properties: + resets: + items: + - description: Watchdog reset + else: + properties: + resets: + items: + - description: APB reset + - description: Core reset + unevaluatedProperties: false =20 examples: --=20 2.25.1