From patchwork Wed Aug 21 14:38:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107119 Return-Path: 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 23E5B13A4 for ; Wed, 21 Aug 2019 14:39:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECC2422DA7 for ; Wed, 21 Aug 2019 14:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398347; bh=bpvKrS4xjqV8MEvCfqz1VDqPz4Adz4s3wbNsncnxpkY=; h=From:To:Cc:Subject:Date:List-ID:From; b=HnE7zDZydSQeKKPo3sIqkompB6Nqkan1kPJk6wTpEQkWAeXlZCtN3FkDKaWwfg8DR gyPpSgCReweJRWAmRuZ/Q7B+jdub8gs8bbXsCsnFzHGC0QvGlGMDBxbIfKH/tKkRPt ubxf4EnPZ15ajiM3jsr9qkOLqSgaiIA7+G/Grwo8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728995AbfHUOii (ORCPT ); Wed, 21 Aug 2019 10:38:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:38110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728724AbfHUOii (ORCPT ); Wed, 21 Aug 2019 10:38:38 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4E833206BA; Wed, 21 Aug 2019 14:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398317; bh=bpvKrS4xjqV8MEvCfqz1VDqPz4Adz4s3wbNsncnxpkY=; h=From:To:Cc:Subject:Date:From; b=wj3piKtzc7YjEGap2/eQeyeo2oaQNmjEcEc+Rvvy5t+402fgWQLymblGmGp/Hc8Wf Le9aKUL5EYLmOOYojmaWn4mUa9XdHH0VQHiOXyo8FgcOu0vSRn/RpplR3x7sSy8Oka /hK9V/wqVzoIB7eXn4cb+dB7XNiwxZpM13yiIcXY= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 1/6] dt-bindings: watchdog: Add YAML schemas for the generic watchdog bindings Date: Wed, 21 Aug 2019 16:38:30 +0200 Message-Id: <20190821143835.7294-1-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The watchdogs have a bunch of generic properties that are needed in a device tree. Add a YAML schemas for those. Reviewed-by: Rob Herring Signed-off-by: Maxime Ripard Reviewed-by: Guenter Roeck --- Changes from v1: - New patch --- .../bindings/watchdog/watchdog.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml diff --git a/Documentation/devicetree/bindings/watchdog/watchdog.yaml b/Documentation/devicetree/bindings/watchdog/watchdog.yaml new file mode 100644 index 000000000000..187bf6cb62bf --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/watchdog.yaml @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/watchdog.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Watchdog Generic Bindings + +maintainers: + - Guenter Roeck + - Wim Van Sebroeck + +description: | + This document describes generic bindings which can be used to + describe watchdog devices in a device tree. + +properties: + $nodename: + pattern: "^watchdog(@.*|-[0-9a-f])?$" + + timeout-sec: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Contains the watchdog timeout in seconds. + +... From patchwork Wed Aug 21 14:38:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107117 Return-Path: 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 9DCEE14F7 for ; Wed, 21 Aug 2019 14:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CA592339F for ; Wed, 21 Aug 2019 14:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398346; bh=eJ9mdPF8bwcHy4e3Y3EhyW1YNP3Drr6jk1OFNQOt26M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wofc5b+fdE2iLkBn1YPuTcRySzt/9Bom4qcan48VEyh6Evp5H+W1VZ1V2RL/LgLje 3yk+U4VIaI+eOlMVo24hS9vLEgsaCOOQUH/B5YR5vkJdTa0Zdx1cUrVfgjQFY1Gs0Q sqCGOpPhXfHCkDFhXailiELD09se+HwaksIhDymw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729437AbfHUOim (ORCPT ); Wed, 21 Aug 2019 10:38:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:38192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728724AbfHUOil (ORCPT ); Wed, 21 Aug 2019 10:38:41 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 516802339F; Wed, 21 Aug 2019 14:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398320; bh=eJ9mdPF8bwcHy4e3Y3EhyW1YNP3Drr6jk1OFNQOt26M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E3D/uYAZ34F2zDSbWxjIo+CVyv99LkqXGoPzJTIODaDjBJeClgDniqOfhC2hpKVsR ROPzYj1mg5WkDCYj94K0Knitx4SksK7nlMoP51Jq1TxSej3vOFGPSacA2zxTjzHdeg IW0mOlUiALBGrM3INz8L/UHV004hCKBvhBSZWOnY= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 2/6] dt-bindings: watchdog: Convert Allwinner watchdog to a schema Date: Wed, 21 Aug 2019 16:38:31 +0200 Message-Id: <20190821143835.7294-2-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821143835.7294-1-mripard@kernel.org> References: <20190821143835.7294-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The Allwinner SoCs have a watchdog supported in Linux, with a matching Device Tree binding. Now that we have the DT validation in place, let's convert the device tree bindings for that controller over to a YAML schemas. Reviewed-by: Rob Herring Signed-off-by: Maxime Ripard Reviewed-by: Guenter Roeck --- Changes from v1: - Use generic watchdog schema - Use unevaluatedProperties instead of additionalProperties --- .../watchdog/allwinner,sun4i-a10-wdt.yaml | 48 +++++++++++++++++++ .../bindings/watchdog/sunxi-wdt.txt | 22 --------- 2 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml new file mode 100644 index 000000000000..dc7553f57708 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/allwinner,sun4i-a10-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A10 Watchdog Device Tree Bindings + +allOf: + - $ref: "watchdog.yaml#" + +maintainers: + - Chen-Yu Tsai + - Maxime Ripard + +properties: + compatible: + oneOf: + - const: allwinner,sun4i-a10-wdt + - const: allwinner,sun6i-a31-wdt + - items: + - const: allwinner,sun50i-a64-wdt + - const: allwinner,sun6i-a31-wdt + - items: + - const: allwinner,sun50i-h6-wdt + - const: allwinner,sun6i-a31-wdt + - items: + - const: allwinner,suniv-f1c100s-wdt + - const: allwinner,sun4i-a10-wdt + + reg: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + wdt: watchdog@1c20c90 { + compatible = "allwinner,sun4i-a10-wdt"; + reg = <0x01c20c90 0x10>; + timeout-sec = <10>; + }; + +... diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt deleted file mode 100644 index e65198d82a2b..000000000000 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +++ /dev/null @@ -1,22 +0,0 @@ -Allwinner SoCs Watchdog timer - -Required properties: - -- compatible : should be one of - "allwinner,sun4i-a10-wdt" - "allwinner,sun6i-a31-wdt" - "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt" - "allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt" - "allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt" -- reg : Specifies base physical address and size of the registers. - -Optional properties: -- timeout-sec : Contains the watchdog timeout in seconds - -Example: - -wdt: watchdog@1c20c90 { - compatible = "allwinner,sun4i-a10-wdt"; - reg = <0x01c20c90 0x10>; - timeout-sec = <10>; -}; From patchwork Wed Aug 21 14:38:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107115 Return-Path: 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 33CF214F7 for ; Wed, 21 Aug 2019 14:39:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12C342339F for ; Wed, 21 Aug 2019 14:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398345; bh=oJGr4uBf27t1EnvM3eWCwbVoz4PVt3i7Qe7GuzWbUyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ww5fMCsNEmUVZDiCnvWXND3C+2gcG82trGYnn2xlbSQ4FC8z1LbVhGapV7KcYnqow duEy/5b02hKmzE1/5hv1HrFGWqj2nw2JKI7HCjj+7BGinaOG1EVjmtMTiwaL1PvQca m4vd5lodmJtY6k9WjtwGrqTvljK5ElxJ8065P2Cw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729466AbfHUOio (ORCPT ); Wed, 21 Aug 2019 10:38:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:38272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728724AbfHUOio (ORCPT ); Wed, 21 Aug 2019 10:38:44 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3F3C22DA7; Wed, 21 Aug 2019 14:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398323; bh=oJGr4uBf27t1EnvM3eWCwbVoz4PVt3i7Qe7GuzWbUyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zCvaTN1k+hCPKmYi5wTT7n1rFaoExQIjF9NVU/6IMfbpbFQlyqxkRo8mW/VovoSea UDqby8tqZNWVAzobAdGBf3xgQXExRChW+cF3SeA2lS2UwYuaQfgTf8pRXuA6akTydk 8WcQsa59mah6+eDl9zVVvEtDCmKcV0ml3aERhpiA= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 3/6] dt-bindings: watchdog: sun4i: Add the watchdog interrupts Date: Wed, 21 Aug 2019 16:38:32 +0200 Message-Id: <20190821143835.7294-3-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821143835.7294-1-mripard@kernel.org> References: <20190821143835.7294-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The Allwinner watchdog has an interrupt, either shared or dedicated depending on the SoC, that has been described in some DT, but not all of them. The binding is also completely missing that description. Let's add that property to be consistent. Reviewed-by: Rob Herring Signed-off-by: Maxime Ripard Reviewed-by: Guenter Roeck --- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index dc7553f57708..31c95c404619 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -31,9 +31,13 @@ properties: reg: maxItems: 1 + interrupts: + maxItems: 1 + required: - compatible - reg + - interrupts unevaluatedProperties: false @@ -42,6 +46,7 @@ examples: wdt: watchdog@1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; + interrupts = <24>; timeout-sec = <10>; }; From patchwork Wed Aug 21 14:38:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107113 Return-Path: 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 53D1313A4 for ; Wed, 21 Aug 2019 14:39:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28AE02339F for ; Wed, 21 Aug 2019 14:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398340; bh=kWS1IJNtZwpR6Tu1rPoZ6ol1cRQDzAO9uYXRVmzqlQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pEAjHyX7G9wzYEgCe1nhG/eJhQFNVYbDDBo/wcuRQr+SrvPcXZ5Nd5bsvO+flfLBZ eyw3JllKU9KSBUU2DRvYI8RLtpog47fu5uA6jL4vWsbSooKdEjzdp0Mb9TmZG0W4aj eu5xVxIU3tKxciq2I+6zWVnwGonuCW2iTJ21iiEY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728724AbfHUOir (ORCPT ); Wed, 21 Aug 2019 10:38:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:38368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729484AbfHUOiq (ORCPT ); Wed, 21 Aug 2019 10:38:46 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A01F233A0; Wed, 21 Aug 2019 14:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398325; bh=kWS1IJNtZwpR6Tu1rPoZ6ol1cRQDzAO9uYXRVmzqlQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Scm4h2kZA2DV7qqzZeUzEy6U5YK50q64Cs4lszRV8MqbZOL2O/gIDU39DwmzHyCB9 Ethfk7PgtPyQorD65o+TcL9f2oK47Dv0dg+uDlphMgLSgfST3eRUnRA1IEBsEVAdvg wkMg/LJBzPyvNFKZ8qW6udd6Wcxd4TaGg/4eCOHE= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 4/6] dt-bindings: watchdog: sun4i: Add the watchdog clock Date: Wed, 21 Aug 2019 16:38:33 +0200 Message-Id: <20190821143835.7294-4-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821143835.7294-1-mripard@kernel.org> References: <20190821143835.7294-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The Allwinner watchdog has a clock that has been described in some DT, but not all of them. The binding is also completely missing that description. Let's add that property to be consistent. Reviewed-by: Rob Herring Signed-off-by: Maxime Ripard Reviewed-by: Guenter Roeck --- Changes from v1: - New patch --- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index 31c95c404619..3a54f58683a0 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -31,12 +31,16 @@ properties: reg: maxItems: 1 + clocks: + maxItems: 1 + interrupts: maxItems: 1 required: - compatible - reg + - clocks - interrupts unevaluatedProperties: false @@ -47,6 +51,7 @@ examples: compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; interrupts = <24>; + clocks = <&osc24M>; timeout-sec = <10>; }; From patchwork Wed Aug 21 14:38:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107111 Return-Path: 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 1F25913A4 for ; Wed, 21 Aug 2019 14:38:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F191F23404 for ; Wed, 21 Aug 2019 14:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398339; bh=DA85JOVNFPWPStswpUDF6myQDvbRXdu99ZhZWEbbl3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tuNRvWpbibAG/AFNgZHH3LWna7pGRFSLyW4mfxfH7jC2C0h04HeT4yMqm9iIM1KJz rEtgEiHP0YOYado0u+T2BoOJgISc880iCGep8rqE4xodues7RHa40jDATPJm/EqfoR qqJc4Rdfx/HJw0eqxX/wNg6mEVV27jW7/SBNuHTs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729521AbfHUOiu (ORCPT ); Wed, 21 Aug 2019 10:38:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:38486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729229AbfHUOit (ORCPT ); Wed, 21 Aug 2019 10:38:49 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC3B623400; Wed, 21 Aug 2019 14:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398328; bh=DA85JOVNFPWPStswpUDF6myQDvbRXdu99ZhZWEbbl3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ivKrxb0hITorRCMXINhuL8gYPEvPLCjTDY2oLgZKdfm17iADWffezYYqTh/AMj5rx GoReMFagTQFx7q2IbQoDISbPnAqn/ohIKIKdxbP4C2uIaTFBHNGNO1TFPtIdmgLhbM qMKqb9VEQd8Xj90ybBhEnliGoVxvsjNW07tjiLBA= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 5/6] ARM: dts: sunxi: Add missing watchdog interrupts Date: Wed, 21 Aug 2019 16:38:34 +0200 Message-Id: <20190821143835.7294-5-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821143835.7294-1-mripard@kernel.org> References: <20190821143835.7294-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The watchdog has an interrupt on all our SoCs, but it wasn't always listed. Add it to the devicetree where it's missing. Acked-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun4i-a10.dtsi | 1 + arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + arch/arm/boot/dts/sun7i-a20.dtsi | 1 + arch/arm/boot/dts/sun8i-r40.dtsi | 1 + 5 files changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 077d45c7db6f..eed9fcb46185 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -815,6 +815,7 @@ wdt: watchdog@1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; + interrupts = <24>; }; rtc: rtc@1c20d00 { diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 4e725afe7203..29a825f7afd1 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -600,6 +600,7 @@ wdt: watchdog@1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; + interrupts = <24>; }; ir0: ir@1c21800 { diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 8176da53dadf..cba8864bb8f9 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -744,6 +744,7 @@ wdt1: watchdog@1c20ca0 { compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; + interrupts = ; }; spdif: spdif@1c21000 { diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 651d7fe6b8ba..8e31ed4a297c 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1115,6 +1115,7 @@ wdt: watchdog@1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; + interrupts = ; }; rtc: rtc@1c20d00 { diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi index 09e20768228c..f1be554b5894 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi @@ -404,6 +404,7 @@ wdt: watchdog@1c20c90 { compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; + interrupts = ; }; uart0: serial@1c28000 { From patchwork Wed Aug 21 14:38:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11107107 Return-Path: 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 921EE14F7 for ; Wed, 21 Aug 2019 14:38:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 658D4233FD for ; Wed, 21 Aug 2019 14:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398332; bh=pn/uJER7PFGwozA06AW0T66hI7CzN2YyTKZKxVMBqDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u/dDuIylZ46zSNTmgr/TqsTNeH11iHiwS/clE1Eee6Gl41k4WQzzQdPlSwFLqaZ5q 7o1Vn+3k2DeD04Zq5E8A6gUFc6xK0e0UW2rh6j4XtkwR2E8/tDCDEEhXXTbE9RHwFM vkiJ6BJd7kFZ0mAdbN3XsFvTDQEJa/E5oMxQhlHY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729532AbfHUOiv (ORCPT ); Wed, 21 Aug 2019 10:38:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:38562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729486AbfHUOiv (ORCPT ); Wed, 21 Aug 2019 10:38:51 -0400 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4FAA923403; Wed, 21 Aug 2019 14:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566398330; bh=pn/uJER7PFGwozA06AW0T66hI7CzN2YyTKZKxVMBqDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tfqHRJ8r0kVu25YN0mX/BohJ7zvMI4cZvdjhVn3triarWc6pdhCQS5fOh7RLu+I6Y GiGb02oaRiAK/0qGHoFOS7duS5c6K3jHWTMapuQPuFs5w4NuW9nRxqtsit3esz8W2H iWTIyEy+zShd4uG9YVw8fAOrS5LI6xIN5//WFap0= From: Maxime Ripard To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-kernel@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH RESEND v2 6/6] ARM: dts: sunxi: Add missing watchdog clocks Date: Wed, 21 Aug 2019 16:38:35 +0200 Message-Id: <20190821143835.7294-6-mripard@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821143835.7294-1-mripard@kernel.org> References: <20190821143835.7294-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Maxime Ripard The watchdog has a clock on all our SoCs, but it wasn't always listed. Add it to the devicetree where it's missing. Signed-off-by: Maxime Ripard --- Changes from v1: - New patch --- arch/arm/boot/dts/sun4i-a10.dtsi | 1 + arch/arm/boot/dts/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31.dtsi | 1 + arch/arm/boot/dts/sun7i-a20.dtsi | 1 + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 + arch/arm/boot/dts/sun8i-r40.dtsi | 1 + arch/arm/boot/dts/sun8i-v3s.dtsi | 1 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 ++ 10 files changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index eed9fcb46185..ce823c44e98a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -816,6 +816,7 @@ compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; interrupts = <24>; + clocks = <&osc24M>; }; rtc: rtc@1c20d00 { diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 29a825f7afd1..cfb1efc8828c 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -601,6 +601,7 @@ compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; interrupts = <24>; + clocks = <&osc24M>; }; ir0: ir@1c21800 { diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index cba8864bb8f9..bbeb743633c6 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -745,6 +745,7 @@ compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = ; + clocks = <&osc24M>; }; spdif: spdif@1c21000 { diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 8e31ed4a297c..ddaafde0e2d6 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1116,6 +1116,7 @@ compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; interrupts = ; + clocks = <&osc24M>; }; rtc: rtc@1c20d00 { diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 954489b4ec66..52eed0ae3607 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -452,6 +452,7 @@ compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = ; + clocks = <&osc24M>; }; pwm: pwm@1c21400 { diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi index f1be554b5894..bde068111b85 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi @@ -405,6 +405,7 @@ compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; interrupts = ; + clocks = <&osc24M>; }; uart0: serial@1c28000 { diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index ddbcc28dc541..23ba56df38f7 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -339,6 +339,7 @@ compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = ; + clocks = <&osc24M>; }; lradc: lradc@1c22800 { diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 224e105a994a..eba190b3f9de 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -574,6 +574,7 @@ compatible = "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = ; + clocks = <&osc24M>; }; spdif: spdif@1c21000 { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index ddb6f11e89df..69128a6dfc46 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -1169,6 +1169,7 @@ "allwinner,sun6i-a31-wdt"; reg = <0x01c20ca0 0x20>; interrupts = ; + clocks = <&osc24M>; }; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 67b732e34091..e304b110e7a3 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -225,6 +225,7 @@ "allwinner,sun6i-a31-wdt"; reg = <0x030090a0 0x20>; interrupts = ; + clocks = <&osc24M>; /* Broken on some H6 boards */ status = "disabled"; }; @@ -725,6 +726,7 @@ "allwinner,sun6i-a31-wdt"; reg = <0x07020400 0x20>; interrupts = ; + clocks = <&osc24M>; }; r_intc: interrupt-controller@7021000 {