From patchwork Sat Apr 15 09:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 674484 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 427F5C77B71 for ; Sat, 15 Apr 2023 09:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbjDOJ6R (ORCPT ); Sat, 15 Apr 2023 05:58:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbjDOJ6Q (ORCPT ); Sat, 15 Apr 2023 05:58:16 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4718C40D4 for ; Sat, 15 Apr 2023 02:58:14 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id dm2so51805619ejc.8 for ; Sat, 15 Apr 2023 02:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681552693; x=1684144693; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qBW7voqUuCZ1/G9Ruo0KBFBVOsPyocZSL7gk/zrdikA=; b=vV0UVC8YX5hmGr0O97HyyHm2Xo8rJmT7MUThJiturG/vbsOZEQRCW+4Z0YLug1TOuA 9Fl8JfgAPV0dxpjL6yz1awbckIWcCiv4Hd8gj0dA972smjEZDmZv4JjOqq7iZVpBW1sY mF5wUG94gjCJkPbW3xKn1lVAPzwYVtZa1qeOWVyYbG8fUaE7YKWfd8oS2zh10JImfbRT O8lCVvmjaHsSea0ZY/SQAum9EPpDkCtdmnt2u3aFbMLw2G9sg2x+R/EdSXH/RcSPmxwH Iu3rdR7zRs4CK/5xpJtAtfDsmNTydHU8iff+2leZXDusAHTEaDLK7m0Ywax1Mb5TkID/ qMrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681552693; x=1684144693; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qBW7voqUuCZ1/G9Ruo0KBFBVOsPyocZSL7gk/zrdikA=; b=KJcMvAALs1MNSbml+fB9VzCJ2i/SdVv9kSZTce04GuTH7kXRf84gNwmrfi4A/xOkuO 2BIQjchTrWy61/FW7mo6jENEaeoLcs4kiosH1J5z3E43kai64eis/GAIuGtw567buAgM gELcmQGg6GPSXf02qan01wuh+eQj3Cpdz1YBBqY4qtGepGmBGWZbpLP4ZNhJU7RH2Tqh HvUwefdyaKMzCgqSCbNMWjtvvG40QR3eyrLzOBMvoDzdeoDfMUupGkkPfXG8BpedbQk0 SGloaOIk/m6T6I82i4svI7M+EpL9bhyEBKvD1OpQb2YW39YzdBBgpgzAy1cBetI0/MeF tecQ== X-Gm-Message-State: AAQBX9f4OOKaASIsI5FhTQ1uq1PDLqpSlgUCDSAaDnqhYK/5UyWqAulo HTeO1TRiRLKZ7ZUom3B31xkpXQ== X-Google-Smtp-Source: AKy350ZYKRSYuyMEh5n5Qwf2//t0LPyGrPZqab6XuiqTfYLkjAF0dCA9it0pvgVfMz92eYuf6M/tYA== X-Received: by 2002:a17:907:1245:b0:94e:6294:9d23 with SMTP id wc5-20020a170907124500b0094e62949d23mr1342399ejb.26.1681552692687; Sat, 15 Apr 2023 02:58:12 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a3bf:4ed:6c53:2a36]) by smtp.gmail.com with ESMTPSA id gn23-20020a1709070d1700b009373f1b5c4esm3594248ejc.161.2023.04.15.02.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 02:58:12 -0700 (PDT) From: Krzysztof Kozlowski To: =?unknown-8bit?q?Wim_Van_Sebroeck_=3Cwim=40linux-watchdog=2Eorg=3E=2C_Gu?= =?unknown-8bit?q?enter_Roeck_=3Clinux=40roeck-us=2Enet=3E=2C_Rob_Herring_?= =?unknown-8bit?q?=3Crobh+dt=40kernel=2Eorg=3E=2C_Krzysztof_Kozlowski_=3Ckrz?= =?unknown-8bit?q?ysztof=2Ekozlowski+dt=40linaro=2Eorg=3E=2C_Neil_Armstrong_?= =?unknown-8bit?q?=3Cneil=2Earmstrong=40linaro=2Eorg=3E=2C_Kevin_Hilman_=3Ck?= =?unknown-8bit?q?hilman=40baylibre=2Ecom=3E=2C_Jerome_Brunet_=3Cjbrunet=40b?= =?unknown-8bit?q?aylibre=2Ecom=3E=2C_Martin_Blumenstingl_=3Cmartin=2Eblumen?= =?unknown-8bit?q?stingl=40googlemail=2Ecom=3E=2C_Julius_Werner_=3Cjwerner?= =?unknown-8bit?q?=40chromium=2Eorg=3E=2C_Evan_Benn_=3Cevanbenn=40chromium?= =?unknown-8bit?q?=2Eorg=3E=2C_Nicolas_Ferre_=3Cnicolas=2Eferre=40microchip?= =?unknown-8bit?q?=2Ecom=3E=2C_Alexandre_Belloni_=3Calexandre=2Ebelloni=40bo?= =?unknown-8bit?q?otlin=2Ecom=3E=2C_Claudiu_Beznea_=3Cclaudiu=2Ebeznea=40mic?= =?unknown-8bit?q?rochip=2Ecom=3E=2C_Florian_Fainelli_=3Cf=2Efainelli=40gmai?= =?unknown-8bit?q?l=2Ecom=3E=2C_Broadcom_internal_kernel_review_list__=3Cbcm?= =?unknown-8bit?q?-kernel-feedback-list=40broadcom=2Ecom=3E=2C_Shawn_Guo_=3C?= =?unknown-8bit?q?shawnguo=40kernel=2Eorg=3E=2C_Sascha_Hauer_=3Cs=2Ehauer=40?= =?unknown-8bit?q?pengutronix=2Ede=3E=2C_Pengutronix_Kernel_Team_=3Ckernel?= =?unknown-8bit?q?=40pengutronix=2Ede=3E=2C_Fabio_Estevam_=3Cfestevam=40gmai?= =?unknown-8bit?q?l=2Ecom=3E=2C_NXP_Linux_Team_=3Clinux-imx=40nxp=2Ecom=3E?= =?unknown-8bit?q?=2C_Matthias_Brugger_=3Cmatthias=2Ebgg=40gmail=2Ecom=3E=2C?= =?unknown-8bit?q?_AngeloGioacchino_Del_Regno__=3Cangelogioacchino=2Edelregn?= =?unknown-8bit?q?o=40collabora=2Ecom=3E=2C_Andy_Gross_=3Cagross=40kernel=2E?= =?unknown-8bit?q?org=3E=2C_Bjorn_Andersson_=3Candersson=40kernel=2Eorg=3E?= =?unknown-8bit?q?=2C_Konrad_Dybcio_=3Ckonrad=2Edybcio=40linaro=2Eorg=3E=2C_?= =?unknown-8bit?q?Sander_Vanheule_=3Csander=40svanheule=2Enet=3E=2C_Maxime_C?= =?unknown-8bit?q?oquelin_=3Cmcoquelin=2Estm32=40gmail=2Ecom=3E=2C_Alexandre?= =?unknown-8bit?q?_Torgue_=3Calexandre=2Etorgue=40foss=2Est=2Ecom=3E=2C_Nobu?= =?unknown-8bit?q?hiro_Iwamatsu_=3Cnobuhiro1=2Eiwamatsu=40toshiba=2Eco=2Ejp?= =?unknown-8bit?q?=3E=2C_Geert_Uytterhoeven_=3Cgeert+renesas=40glider=2Ebe?= =?unknown-8bit?q?=3E=2C_Magnus_Damm_=3Cmagnus=2Edamm=40gmail=2Ecom=3E=2C_Fu?= =?unknown-8bit?q?_Wei_=3Cfu=2Ewei=40linaro=2Eorg=3E=2C_Viresh_Kumar_=3Cvire?= =?unknown-8bit?q?shk=40kernel=2Eorg=3E=2C_Eugen_Hristev_=3Ceugen=2Ehristev?= =?unknown-8bit?q?=40collabora=2Ecom=3E=2C_Justin_Chen_=3Cjustinpopo6=40gmai?= =?unknown-8bit?q?l=2Ecom=3E=2C_=82ecki__=3Crafal=40milecki=2Epl=3E=2C_Linus?= =?unknown-8bit?q?_Walleij_=3Clinus=2Ewalleij=40linaro=2Eorg=3E=2C_Corentin_?= =?unknown-8bit?q?Labbe_=3Cclabbe=40baylibre=2Ecom=3E=2C_Anson_Huang_=3CAnso?= =?unknown-8bit?q?n=2EHuang=40nxp=2Ecom=3E=2C_Robert_Marko_=3Crobert=2Emarko?= =?unknown-8bit?q?=40sartura=2Ehr=3E=2C_Sergio_Paracuellos_=3Csergio=2Eparac?= =?unknown-8bit?q?uellos=40gmail=2Ecom=3E=2C_Sai_Prakash_Ranjan_=3Cquic=5Fsa?= =?unknown-8bit?q?ipraka=40quicinc=2Ecom=3E=2C_Wolfram_Sang_=3Cwsa+renesas?= =?unknown-8bit?q?=40sang-engineering=2Ecom=3E=2C_Jamie_Iles_=3Cjamie=40jami?= =?unknown-8bit?q?eiles=2Ecom=3E=2C_Yannick_Fertre_=3Cyannick=2Efertre=40fos?= =?unknown-8bit?q?s=2Est=2Ecom=3E=2C_Christophe_Roullier_=3Cchristophe=2Erou?= =?unknown-8bit?q?llier=40foss=2Est=2Ecom=3E=2C_Shubhrajyoti_Datta_=3Cshubhr?= =?unknown-8bit?q?ajyoti=2Edatta=40xilinx=2Ecom=3E=2C_Srinivas_Neeli_=3Csrin?= =?unknown-8bit?q?ivas=2Eneeli=40xilinx=2Ecom=3E=2C_linux-watchdog=40vger=2E?= =?unknown-8bit?q?kernel=2Eorg=2C_devicetree=40vger=2Ekernel=2Eorg=2C_linux-?= =?unknown-8bit?q?arm-kernel=40lists=2Einfradead=2Eorg=2C_linux-amlogic=40li?= =?unknown-8bit?q?sts=2Einfradead=2Eorg=2C_linux-kernel=40vger=2Ekernel=2Eor?= =?unknown-8bit?q?g=2C_linux-mediatek=40lists=2Einfradead=2Eorg=2C_linux-arm?= =?unknown-8bit?q?-msm=40vger=2Ekernel=2Eorg=2C_linux-stm32=40st-md-mailman?= =?unknown-8bit?q?=2Estormreply=2Ecom=2C_linux-renesas-soc=40vger=2Ekernel?= =?unknown-8bit?q?=2Eorg?= Cc: Krzysztof Kozlowski Subject: [PATCH 1/6] dt-bindings: watchdog: drop duplicated GPIO watchdog bindings Date: Sat, 15 Apr 2023 11:51:07 +0200 Message-Id: <20230415095112.51257-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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 Reviewed-by: Rob Herring --- .../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 - -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 + - Robert Marko 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: - |