From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: "Wim Van Sebroeck" <wim@linux-watchdog.org>, "Guenter Roeck" <linux@roeck-us.net>, "Rob Herring" <robh+dt@kernel.org>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Neil Armstrong" <neil.armstrong@linaro.org>, "Kevin Hilman" <khilman@baylibre.com>, "Jerome Brunet" <jbrunet@baylibre.com>, "Martin Blumenstingl" <martin.blumenstingl@googlemail.com>, "Julius Werner" <jwerner@chromium.org>, "Evan Benn" <evanbenn@chromium.org>, "Nicolas Ferre" <nicolas.ferre@microchip.com>, "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Claudiu Beznea" <claudiu.beznea@microchip.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Andy Gross" <agross@kernel.org>, "Bjorn Andersson" <andersson@kernel.org>, "Konrad Dybcio" <konrad.dybcio@linaro.org>, "Sander Vanheule" <sander@svanheule.net>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Magnus Damm" <magnus.damm@gmail.com>, "Fu Wei" <fu.wei@linaro.org>, "Viresh Kumar" <vireshk@kernel.org>, "Eugen Hristev" <eugen.hristev@collabora.com>, "Justin Chen" <justinpopo6@gmail.com>, �ecki <rafal@milecki.pl>, "Linus Walleij" <linus.walleij@linaro.org>, "Corentin Labbe" <clabbe@baylibre.com>, "Anson Huang" <Anson.Huang@nxp.com>, "Robert Marko" <robert.marko@sartura.hr>, "Sergio Paracuellos" <sergio.paracuellos@gmail.com>, "Sai Prakash Ranjan" <quic_saipraka@quicinc.com>, "Wolfram Sang" <wsa+renesas@sang-engineering.com>, "Jamie Iles" <jamie@jamieiles.com>, "Yannick Fertre" <yannick.fertre@foss.st.com>, "Christophe Roullier" <christophe.roullier@foss.st.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-renesas-soc@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH 1/6] dt-bindings: watchdog: drop duplicated GPIO watchdog bindings Date: Sat, 15 Apr 2023 11:51:07 +0200 [thread overview] Message-ID: <20230415095112.51257-1-krzysztof.kozlowski@linaro.org> (raw) Two conversions to DT schema of GPIO watchdog binding happened and came through different trees. Merge them into one: 1. Combine maintainers, 2. Use more descriptive property descriptions and constraints from gpio-wdt.yaml, 3. Switch to unevaluatedProperties:false, to allow generic watchdog properties. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/watchdog/gpio-wdt.yaml | 55 ------------------- .../bindings/watchdog/linux,wdt-gpio.yaml | 17 +++++- 2 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml b/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml deleted file mode 100644 index 155dc7965e9b..000000000000 --- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: GPIO controlled watchdog - -maintainers: - - Robert Marko <robert.marko@sartura.hr> - -properties: - compatible: - const: linux,wdt-gpio - - gpios: - maxItems: 1 - description: GPIO connected to the WDT reset pin - - hw_algo: - $ref: /schemas/types.yaml#/definitions/string - description: Algorithm used by the driver - oneOf: - - description: - Either a high-to-low or a low-to-high transition clears the WDT counter. - The watchdog timer is disabled when GPIO is left floating or connected - to a three-state buffer. - const: toggle - - description: - Low or high level starts counting WDT timeout, the opposite level - disables the WDT. - Active level is determined by the GPIO flags. - const: level - - hw_margin_ms: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Maximum time to reset watchdog circuit (in milliseconds) - minimum: 2 - maximum: 65535 - - always-running: - type: boolean - description: - If the watchdog timer cannot be disabled, add this flag to have the driver - keep toggling the signal without a client. - It will only cease to toggle the signal when the device is open and the - timeout elapsed. - -required: - - compatible - - gpios - - hw_algo - - hw_margin_ms - -unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml index 50af79af6416..499f1b7e03f9 100644 --- a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml +++ b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml @@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog maintainers: - Guenter Roeck <linux@roeck-us.net> + - Robert Marko <robert.marko@sartura.hr> properties: compatible: @@ -19,11 +20,23 @@ properties: hw_algo: description: The algorithm used by the driver. - enum: [ level, toggle ] + oneOf: + - description: + Either a high-to-low or a low-to-high transition clears the WDT counter. + The watchdog timer is disabled when GPIO is left floating or connected + to a three-state buffer. + const: toggle + - description: + Low or high level starts counting WDT timeout, the opposite level + disables the WDT. + Active level is determined by the GPIO flags. + const: level hw_margin_ms: description: Maximum time to reset watchdog circuit (milliseconds). $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 2 + maximum: 65535 always-running: type: boolean @@ -42,7 +55,7 @@ required: allOf: - $ref: watchdog.yaml# -additionalProperties: false +unevaluatedProperties: false examples: - | -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: "Wim Van Sebroeck" <wim@linux-watchdog.org>, "Guenter Roeck" <linux@roeck-us.net>, "Rob Herring" <robh+dt@kernel.org>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Neil Armstrong" <neil.armstrong@linaro.org>, "Kevin Hilman" <khilman@baylibre.com>, "Jerome Brunet" <jbrunet@baylibre.com>, "Martin Blumenstingl" <martin.blumenstingl@googlemail.com>, "Julius Werner" <jwerner@chromium.org>, "Evan Benn" <evanbenn@chromium.org>, "Nicolas Ferre" <nicolas.ferre@microchip.com>, "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Claudiu Beznea" <claudiu.beznea@microchip.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Andy Gross" <agross@kernel.org>, "Bjorn Andersson" <andersson@kernel.org>, "Konrad Dybcio" <konrad.dybcio@linaro.org>, "Sander Vanheule" <sander@svanheule.net>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Magnus Damm" <magnus.damm@gmail.com>, "Fu Wei" <fu.wei@linaro.org>, "Viresh Kumar" <vireshk@kernel.org>, "Eugen Hristev" <eugen.hristev@collabora.com>, "Justin Chen" <justinpopo6@gmail.com>, �ecki <rafal@milecki.pl>, "Linus Walleij" <linus.walleij@linaro.org>, "Corentin Labbe" <clabbe@baylibre.com>, "Anson Huang" <Anson.Huang@nxp.com>, "Robert Marko" <robert.marko@sartura.hr>, "Sergio Paracuellos" <sergio.paracuellos@gmail.com>, "Sai Prakash Ranjan" <quic_saipraka@quicinc.com>, "Wolfram Sang" <wsa+renesas@sang-engineering.com>, "Jamie Iles" <jamie@jamieiles.com>, "Yannick Fertre" <yannick.fertre@foss.st.com>, "Christophe Roullier" <christophe.roullier@foss.st.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-renesas-soc@vger.kernel.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH 1/6] dt-bindings: watchdog: drop duplicated GPIO watchdog bindings Date: Sat, 15 Apr 2023 11:51:07 +0200 [thread overview] Message-ID: <20230415095112.51257-1-krzysztof.kozlowski@linaro.org> (raw) Two conversions to DT schema of GPIO watchdog binding happened and came through different trees. Merge them into one: 1. Combine maintainers, 2. Use more descriptive property descriptions and constraints from gpio-wdt.yaml, 3. Switch to unevaluatedProperties:false, to allow generic watchdog properties. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/watchdog/gpio-wdt.yaml | 55 ------------------- .../bindings/watchdog/linux,wdt-gpio.yaml | 17 +++++- 2 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml b/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml deleted file mode 100644 index 155dc7965e9b..000000000000 --- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: GPIO controlled watchdog - -maintainers: - - Robert Marko <robert.marko@sartura.hr> - -properties: - compatible: - const: linux,wdt-gpio - - gpios: - maxItems: 1 - description: GPIO connected to the WDT reset pin - - hw_algo: - $ref: /schemas/types.yaml#/definitions/string - description: Algorithm used by the driver - oneOf: - - description: - Either a high-to-low or a low-to-high transition clears the WDT counter. - The watchdog timer is disabled when GPIO is left floating or connected - to a three-state buffer. - const: toggle - - description: - Low or high level starts counting WDT timeout, the opposite level - disables the WDT. - Active level is determined by the GPIO flags. - const: level - - hw_margin_ms: - $ref: /schemas/types.yaml#/definitions/uint32 - description: Maximum time to reset watchdog circuit (in milliseconds) - minimum: 2 - maximum: 65535 - - always-running: - type: boolean - description: - If the watchdog timer cannot be disabled, add this flag to have the driver - keep toggling the signal without a client. - It will only cease to toggle the signal when the device is open and the - timeout elapsed. - -required: - - compatible - - gpios - - hw_algo - - hw_margin_ms - -unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml index 50af79af6416..499f1b7e03f9 100644 --- a/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml +++ b/Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml @@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog maintainers: - Guenter Roeck <linux@roeck-us.net> + - Robert Marko <robert.marko@sartura.hr> properties: compatible: @@ -19,11 +20,23 @@ properties: hw_algo: description: The algorithm used by the driver. - enum: [ level, toggle ] + oneOf: + - description: + Either a high-to-low or a low-to-high transition clears the WDT counter. + The watchdog timer is disabled when GPIO is left floating or connected + to a three-state buffer. + const: toggle + - description: + Low or high level starts counting WDT timeout, the opposite level + disables the WDT. + Active level is determined by the GPIO flags. + const: level hw_margin_ms: description: Maximum time to reset watchdog circuit (milliseconds). $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 2 + maximum: 65535 always-running: type: boolean @@ -42,7 +55,7 @@ required: allOf: - $ref: watchdog.yaml# -additionalProperties: false +unevaluatedProperties: false examples: - | -- 2.34.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
next reply other threads:[~2023-04-15 9:58 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-04-15 9:51 Krzysztof Kozlowski [this message] 2023-04-15 9:51 ` [PATCH 1/6] dt-bindings: watchdog: drop duplicated GPIO watchdog bindings Krzysztof Kozlowski 2023-04-15 9:51 ` [PATCH 2/6] dt-bindings: watchdog: indentation, quotes and white-space cleanup Krzysztof Kozlowski 2023-04-15 9:51 ` Krzysztof Kozlowski 2023-04-15 12:49 ` Sergio Paracuellos 2023-04-15 12:49 ` Sergio Paracuellos 2023-04-15 16:48 ` Justin Chen 2023-04-15 16:48 ` Justin Chen 2023-04-16 21:12 ` Wolfram Sang 2023-04-16 21:12 ` Wolfram Sang 2023-04-17 7:13 ` Neil Armstrong 2023-04-17 7:13 ` Neil Armstrong 2023-04-17 9:08 ` Nicolas Ferre 2023-04-17 9:08 ` Nicolas Ferre 2023-04-17 9:12 ` Geert Uytterhoeven 2023-04-17 9:12 ` Geert Uytterhoeven 2023-04-18 21:25 ` Rob Herring 2023-04-18 21:25 ` Rob Herring 2023-04-15 9:51 ` [PATCH 3/6] dt-bindings: watchdog: arm,sp805: drop unneeded minItems Krzysztof Kozlowski 2023-04-15 9:51 ` Krzysztof Kozlowski 2023-04-18 21:25 ` Rob Herring 2023-04-18 21:25 ` Rob Herring 2023-04-15 9:51 ` [PATCH 4/6] dt-bindings: watchdog: fsl-imx7ulp-wdt: simplify with unevaluatedProperties Krzysztof Kozlowski 2023-04-15 9:51 ` Krzysztof Kozlowski 2023-04-18 21:30 ` Rob Herring 2023-04-18 21:30 ` Rob Herring 2023-04-15 9:51 ` [PATCH 5/6] dt-bindings: watchdog: toshiba,visconti-wdt: " Krzysztof Kozlowski 2023-04-15 9:51 ` Krzysztof Kozlowski 2023-04-16 20:12 ` nobuhiro1.iwamatsu 2023-04-16 20:12 ` nobuhiro1.iwamatsu 2023-04-18 21:36 ` Rob Herring 2023-04-18 21:36 ` Rob Herring 2023-04-15 9:51 ` [PATCH 6/6] dt-bindings: watchdog: realtek,otto-wdt: simplify requiring interrupt-names Krzysztof Kozlowski 2023-04-15 9:51 ` Krzysztof Kozlowski 2023-04-16 19:00 ` Sander Vanheule 2023-04-16 19:00 ` Sander Vanheule 2023-04-17 6:20 ` Krzysztof Kozlowski 2023-04-17 6:20 ` Krzysztof Kozlowski 2023-04-18 21:39 ` Rob Herring 2023-04-18 21:39 ` Rob Herring 2023-04-16 16:04 ` [PATCH 1/6] dt-bindings: watchdog: drop duplicated GPIO watchdog bindings Guenter Roeck 2023-04-16 16:04 ` Guenter Roeck 2023-04-16 17:26 ` Krzysztof Kozlowski 2023-04-16 17:26 ` Krzysztof Kozlowski 2023-04-16 17:26 ` Krzysztof Kozlowski 2023-04-18 21:35 ` Rob Herring 2023-04-18 21:35 ` Rob Herring 2023-04-18 21:35 ` Rob Herring 2023-04-18 21:23 ` Rob Herring 2023-04-18 21:23 ` Rob Herring 2023-04-21 8:56 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230415095112.51257-1-krzysztof.kozlowski@linaro.org \ --to=krzysztof.kozlowski@linaro.org \ --cc=Anson.Huang@nxp.com \ --cc=agross@kernel.org \ --cc=alexandre.belloni@bootlin.com \ --cc=alexandre.torgue@foss.st.com \ --cc=andersson@kernel.org \ --cc=angelogioacchino.delregno@collabora.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=christophe.roullier@foss.st.com \ --cc=clabbe@baylibre.com \ --cc=claudiu.beznea@microchip.com \ --cc=devicetree@vger.kernel.org \ --cc=eugen.hristev@collabora.com \ --cc=evanbenn@chromium.org \ --cc=f.fainelli@gmail.com \ --cc=festevam@gmail.com \ --cc=fu.wei@linaro.org \ --cc=geert+renesas@glider.be \ --cc=jamie@jamieiles.com \ --cc=jbrunet@baylibre.com \ --cc=justinpopo6@gmail.com \ --cc=jwerner@chromium.org \ --cc=kernel@pengutronix.de \ --cc=khilman@baylibre.com \ --cc=konrad.dybcio@linaro.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-amlogic@lists.infradead.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=magnus.damm@gmail.com \ --cc=martin.blumenstingl@googlemail.com \ --cc=matthias.bgg@gmail.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=neil.armstrong@linaro.org \ --cc=nicolas.ferre@microchip.com \ --cc=nobuhiro1.iwamatsu@toshiba.co.jp \ --cc=quic_saipraka@quicinc.com \ --cc=rafal@milecki.pl \ --cc=robert.marko@sartura.hr \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=sander@svanheule.net \ --cc=sergio.paracuellos@gmail.com \ --cc=shawnguo@kernel.org \ --cc=shubhrajyoti.datta@xilinx.com \ --cc=srinivas.neeli@xilinx.com \ --cc=vireshk@kernel.org \ --cc=wim@linux-watchdog.org \ --cc=wsa+renesas@sang-engineering.com \ --cc=yannick.fertre@foss.st.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.