From patchwork Tue Jun 7 13:56:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 581142 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 CCA95C433EF for ; Tue, 7 Jun 2022 13:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244994AbiFGN5E (ORCPT ); Tue, 7 Jun 2022 09:57:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244995AbiFGN4s (ORCPT ); Tue, 7 Jun 2022 09:56:48 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CD7E5B043A; Tue, 7 Jun 2022 06:56:45 -0700 (PDT) X-IronPort-AV: E=Sophos;i="5.91,283,1647270000"; d="scan'208";a="122171377" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 07 Jun 2022 22:56:44 +0900 Received: from localhost.localdomain (unknown [10.226.93.86]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id E3E8D4487B1A; Tue, 7 Jun 2022 22:56:40 +0900 (JST) From: Phil Edworthy To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski Cc: Phil Edworthy , Wolfram Sang , Geert Uytterhoeven , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Biju Das Subject: [PATCH 1/2] dt-bindings: watchdog: renesas,wdt: Add r9a09g011 (RZ/V2M) support Date: Tue, 7 Jun 2022 14:56:18 +0100 Message-Id: <20220607135619.174110-2-phil.edworthy@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607135619.174110-1-phil.edworthy@renesas.com> References: <20220607135619.174110-1-phil.edworthy@renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Add the documentation for the r9a09g011 SoC, but in doing so also reorganise the doc to make it easier to read. Additionally, make the binding require an interrupt to be specified. Whilst the driver does not need an interrupt, all of the SoCs that use this binding actually provide one. Signed-off-by: Phil Edworthy Reviewed-by: Biju Das --- .../bindings/watchdog/renesas,wdt.yaml | 63 ++++++++++++------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml index a8d7dde5271b..6473734921e3 100644 --- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml @@ -31,6 +31,11 @@ properties: - renesas,r9a07g054-wdt # RZ/V2L - const: renesas,rzg2l-wdt + - items: + - enum: + - renesas,r9a09g011-wdt # RZ/V2M + - const: renesas,rzv2m-wdt # RZ/V2M + - items: - enum: - renesas,r8a7742-wdt # RZ/G1H @@ -70,13 +75,27 @@ properties: reg: maxItems: 1 - interrupts: true + interrupts: + minItems: 1 + items: + - description: Timeout + - description: Parity error - interrupt-names: true + interrupt-names: + items: + - const: wdt + - const: perrout - clocks: true + clocks: + minItems: 1 + items: + - description: Register access clock + - description: Main clock - clock-names: true + clock-names: + items: + - const: pclk + - const: oscclk power-domains: maxItems: 1 @@ -89,6 +108,7 @@ properties: required: - compatible - reg + - interrupts - clocks allOf: @@ -112,32 +132,31 @@ allOf: compatible: contains: enum: + - renesas,rzv2m-wdt - renesas,rzg2l-wdt then: properties: - interrupts: - maxItems: 2 - interrupt-names: - items: - - const: wdt - - const: perrout clocks: - items: - - description: Register access clock - - description: Main clock + minItems: 2 clock-names: - items: - - const: pclk - - const: oscclk + minItems: 2 required: - clock-names - - interrupt-names - else: + + - if: + properties: + compatible: + contains: + enum: + - renesas,rzg2l-wdt + then: properties: interrupts: - maxItems: 1 - clocks: - maxItems: 1 + minItems: 2 + interrupt-names: + minItems: 2 + required: + - interrupt-names additionalProperties: false @@ -145,9 +164,11 @@ examples: - | #include #include + #include wdt0: watchdog@e6020000 { compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt"; reg = <0xe6020000 0x0c>; + interrupts = ; clocks = <&cpg CPG_MOD 402>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; resets = <&cpg 402>; From patchwork Tue Jun 7 13:56:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 579784 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 E3FDFCCA483 for ; Tue, 7 Jun 2022 13:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244997AbiFGN5F (ORCPT ); Tue, 7 Jun 2022 09:57:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245003AbiFGN5E (ORCPT ); Tue, 7 Jun 2022 09:57:04 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 24F2BB2259; Tue, 7 Jun 2022 06:56:57 -0700 (PDT) X-IronPort-AV: E=Sophos;i="5.91,284,1647270000"; d="scan'208";a="123619772" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 07 Jun 2022 22:56:57 +0900 Received: from localhost.localdomain (unknown [10.226.93.86]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 96DC14487F01; Tue, 7 Jun 2022 22:56:54 +0900 (JST) From: Phil Edworthy To: Wim Van Sebroeck , Guenter Roeck Cc: Phil Edworthy , linux-watchdog@vger.kernel.org, Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org, Biju Das Subject: [PATCH 2/2] watchdog: rzg2l_wdt: Add rzv2m compatible string Date: Tue, 7 Jun 2022 14:56:19 +0100 Message-Id: <20220607135619.174110-3-phil.edworthy@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607135619.174110-1-phil.edworthy@renesas.com> References: <20220607135619.174110-1-phil.edworthy@renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The WDT on RZ/V2M devices is basically the same as RZ/G2L, with the exception that the RZ/V2M has a single combined interrupt, whereas the RZ/G2L has time out and error interrupts. Signed-off-by: Phil Edworthy Reviewed-by: Biju Das --- drivers/watchdog/rzg2l_wdt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c index 6eea0ee4af49..cee3eef7cc47 100644 --- a/drivers/watchdog/rzg2l_wdt.c +++ b/drivers/watchdog/rzg2l_wdt.c @@ -256,6 +256,7 @@ static int rzg2l_wdt_probe(struct platform_device *pdev) static const struct of_device_id rzg2l_wdt_ids[] = { { .compatible = "renesas,rzg2l-wdt", }, + { .compatible = "renesas,rzv2m-wdt", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, rzg2l_wdt_ids);