From patchwork Sat Dec 9 14:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ji Sheng Teoh X-Patchwork-Id: 752240 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> Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX072.cuchost.com (172.16.6.82) X-YovoleRuleAgent: yovoleflag 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 --- drivers/watchdog/starfive-wdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.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 = { static const struct of_device_id starfive_wdt_match[] = { { .compatible = "starfive,jh7100-wdt", .data = &starfive_wdt_jh7100_variant }, { .compatible = "starfive,jh7110-wdt", .data = &starfive_wdt_jh7110_variant }, + { .compatible = "starfive,jh8100-wdt", .data = &starfive_wdt_jh7110_variant }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, starfive_wdt_match); From patchwork Sat Dec 9 14:27:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ji Sheng Teoh X-Patchwork-Id: 753470 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> Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX072.cuchost.com (172.16.6.82) X-YovoleRuleAgent: yovoleflag 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. -allOf: - - $ref: watchdog.yaml# - properties: compatible: enum: - starfive,jh7100-wdt - starfive,jh7110-wdt + - starfive,jh8100-wdt reg: maxItems: 1 @@ -44,11 +42,6 @@ properties: - const: apb - const: core - resets: - items: - - description: APB reset - - description: Core reset - required: - compatible - reg @@ -56,6 +49,26 @@ required: - clock-names - resets +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 examples: