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: 13212401 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AC80C77B7D for ; Sat, 15 Apr 2023 09:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=NowpKhxFnvmTXxfHqtKdBdE80trkaqschZIlvNF1KvQ=; b=063jBDHjshTlHp iKOg2Ikd17yf7E3kaogw7C8FDCch896SIUmnKiiNBZvfeA8xOvIyuwtOI6llDl3LqDZKpmgl6N2wu mwJg1p3CEV2P4Ty82prhW7KMeYeQU1ZfRwm3bTHmjr13FMvQWPAY0fNC02J9tyi3l7654ICQlEuk2 JEQJldI48kjPm2mZh3uP0B0ALey0KMKQ6/cc8JNnvIfo1WEIyGEdqtoZ90oIh5AT2QjXnbOh0rLfe LiRM7eVyS1n98zmrNiM23Mxe53g1JylO4UZP1312N5X8cAyhK8o2wIB2pWIZ29W7HKmGcpw+VByyt YyM6UXblIA5gFTakT3eA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pncfh-00Bm0j-2T; Sat, 15 Apr 2023 09:58:17 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pncff-00Blyq-0J for linux-amlogic@lists.infradead.org; Sat, 15 Apr 2023 09:58:16 +0000 Received: by mail-ej1-x636.google.com with SMTP id kt6so13527606ejb.0 for ; Sat, 15 Apr 2023 02:58:13 -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=H8AwzLsfSI4dNtSEgLxe+L9W2H1aAzthYkaUxnqvh54+A/nlfBVlkdBKeckyMwICcO JcMD3zkZK+f+eA3aWaaRp73CrOcin1GcRvjwMFd5W7H7+iXd5BxKJDRyeLMKrU2sQ4ol u3w1HQZ+u5cn4sKe5pXhXgudFWviNpnj4LuI0ht3kD9EorWa5E9LcxX34mW3BAaRM0Ux mdNsXKEz5GxeA/tTytfz665/MO2PEaWB4yMKqIlKSX8Sjl7lEYciZDTiFE994YOGkRTR cPKQMp0DFYtFLe60RGOU96ZOkPncNJJ+vIy0pin6WnMzVOl/o82XTx/rpIltVOGaKTGO dG8Q== X-Gm-Message-State: AAQBX9fbV03MDOlglwzrF7I8KIrkRDVu41NCkwUF+/cuwenFT0qGAjg5 TKEtqu8+c5pLiBrN0TBlcwIgjQ== 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_=3Cs?= =?unknown-8bit?q?hawnguo=40kernel=2Eorg=3E=2C_Sascha_Hauer_=3Cs=2Ehauer=40p?= =?unknown-8bit?q?engutronix=2Ede=3E=2C_Pengutronix_Kernel_Team_=3Ckernel=40?= =?unknown-8bit?q?pengutronix=2Ede=3E=2C_Fabio_Estevam_=3Cfestevam=40gmail?= =?unknown-8bit?q?=2Ecom=3E=2C_NXP_Linux_Team_=3Clinux-imx=40nxp=2Ecom=3E=2C?= =?unknown-8bit?q?_Matthias_Brugger_=3Cmatthias=2Ebgg=40gmail=2Ecom=3E=2C_An?= =?unknown-8bit?q?geloGioacchino_Del_Regno_=3Cangelogioacchino=2Edelregno=40?= =?unknown-8bit?q?collabora=2Ecom=3E=2C_Andy_Gross_=3Cagross=40kernel=2Eorg?= =?unknown-8bit?q?=3E=2C_Bjorn_Andersson_=3Candersson=40kernel=2Eorg=3E=2C_K?= =?unknown-8bit?q?onrad_Dybcio_=3Ckonrad=2Edybcio=40linaro=2Eorg=3E=2C_Sande?= =?unknown-8bit?q?r_Vanheule_=3Csander=40svanheule=2Enet=3E=2C_Maxime_Coquel?= =?unknown-8bit?q?in_=3Cmcoquelin=2Estm32=40gmail=2Ecom=3E=2C_Alexandre_Torg?= =?unknown-8bit?q?ue_=3Calexandre=2Etorgue=40foss=2Est=2Ecom=3E=2C_Nobuhiro_?= =?unknown-8bit?q?Iwamatsu_=3Cnobuhiro1=2Eiwamatsu=40toshiba=2Eco=2Ejp=3E=2C?= =?unknown-8bit?q?_Geert_Uytterhoeven_=3Cgeert+renesas=40glider=2Ebe=3E=2C_M?= =?unknown-8bit?q?agnus_Damm_=3Cmagnus=2Edamm=40gmail=2Ecom=3E=2C_Fu_Wei_=3C?= =?unknown-8bit?q?fu=2Ewei=40linaro=2Eorg=3E=2C_Viresh_Kumar_=3Cvireshk=40ke?= =?unknown-8bit?q?rnel=2Eorg=3E=2C_Eugen_Hristev_=3Ceugen=2Ehristev=40collab?= =?unknown-8bit?q?ora=2Ecom=3E=2C_Justin_Chen_=3Cjustinpopo6=40gmail=2Ecom?= =?unknown-8bit?q?=3E=2C_=82ecki__=3Crafal=40milecki=2Epl=3E=2C_Linus_Wallei?= =?unknown-8bit?q?j_=3Clinus=2Ewalleij=40linaro=2Eorg=3E=2C_Corentin_Labbe_?= =?unknown-8bit?q?=3Cclabbe=40baylibre=2Ecom=3E=2C_Anson_Huang_=3CAnson=2EHu?= =?unknown-8bit?q?ang=40nxp=2Ecom=3E=2C_Robert_Marko_=3Crobert=2Emarko=40sar?= =?unknown-8bit?q?tura=2Ehr=3E=2C_Sergio_Paracuellos_=3Csergio=2Eparacuellos?= =?unknown-8bit?q?=40gmail=2Ecom=3E=2C_Sai_Prakash_Ranjan_=3Cquic=5Fsaipraka?= =?unknown-8bit?q?=40quicinc=2Ecom=3E=2C_Wolfram_Sang_=3Cwsa+renesas=40sang-?= =?unknown-8bit?q?engineering=2Ecom=3E=2C_Jamie_Iles_=3Cjamie=40jamieiles=2E?= =?unknown-8bit?q?com=3E=2C_Yannick_Fertre_=3Cyannick=2Efertre=40foss=2Est?= =?unknown-8bit?q?=2Ecom=3E=2C_Christophe_Roullier_=3Cchristophe=2Eroullier?= =?unknown-8bit?q?=40foss=2Est=2Ecom=3E=2C_Shubhrajyoti_Datta_=3Cshubhrajyot?= =?unknown-8bit?q?i=2Edatta=40xilinx=2Ecom=3E=2C_Srinivas_Neeli_=3Csrinivas?= =?unknown-8bit?q?=2Eneeli=40xilinx=2Ecom=3E=2C_linux-watchdog=40vger=2Ekern?= =?unknown-8bit?q?el=2Eorg=2C_devicetree=40vger=2Ekernel=2Eorg=2C_linux-arm-?= =?unknown-8bit?q?kernel=40lists=2Einfradead=2Eorg=2C_linux-amlogic=40lists?= =?unknown-8bit?q?=2Einfradead=2Eorg=2C_linux-kernel=40vger=2Ekernel=2Eorg?= =?unknown-8bit?q?=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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230415_025815_135883_7D2099C7 X-CRM114-Status: GOOD ( 15.50 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.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: Guenter Roeck 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: - |