From patchwork Sun Nov 5 18:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13446077 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 8D110C4167D for ; Sun, 5 Nov 2023 18:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229534AbjKESmG (ORCPT ); Sun, 5 Nov 2023 13:42:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjKESmG (ORCPT ); Sun, 5 Nov 2023 13:42:06 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1A11DE for ; Sun, 5 Nov 2023 10:42:01 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so2240577f8f.1 for ; Sun, 05 Nov 2023 10:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699209720; x=1699814520; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=s6FXMyoR2RkXPnTlL3+97juQKdzA3iKTZ459azEjBsw=; b=F/uCba3NEC5bzb8IP/RynFGDf+Cka/YY/OydrpQTAEApzF3epbVmB3d2ZH9MeOf5qP jpKUdFV/Z+NOp7gzdrnCTjZ12bGC0sxIf82WnGsKFB+jlO7N+HTKYCNP88gPM0qPf2Yj e+6Gv3e4yzswfOp9HCGUoDVQyMDvVazOG2jntteZYhSfV27LHnYaZDz4+lrjJYReTZoK 2I4305hbNGu/zD+pMhv5S57025OINFnVgFWKebnO8H28rvOQ2wFqsfyHFSRwAXsKKXYY 68Omun9f+cTg0sEUWwQH+Jlul0OfE8ep6eem7Qbey7ptcgmpttDFnfUgXXtjHPbpr+m9 jqYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699209720; x=1699814520; 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=s6FXMyoR2RkXPnTlL3+97juQKdzA3iKTZ459azEjBsw=; b=exaIw61i4NWFzcHuga+95b8W7tGoWWZbQOqkYDIy4LUuxb5rEjpwqOOhw48k0skNRP 5Qf7V1ET0jTirEX7ALyGvMYsAZXiASPihZR2hsjy+wfjZCQ6yvtEjd40txiBpqR5ZXAM MdVvbIgYGe7huAe+bQbLVZI+GBtQX7CVn/3hBn/FlVHXDiBgTLm7pAHsxhkfF+y14mRW CMiVJy+j4edmdmfao7396XroEYC7vrLF0A+p9U73i8P58lue7RFg+gc/1hu+avvU2kgs mPSYeHKjXoUzJawpI1y5e6/NmbRj2CPvRAI4TJHgBUKCUIjsMJS3eO3UfNepuFONkM2Z Qw2A== X-Gm-Message-State: AOJu0Yz6dSZ7rzjPE9bT0jeqXjF+fUwM55AMtv8t0Tmy24ZkTWOut0x5 ERPplcW7PIMc4lcgVG6qQKQP0w== X-Google-Smtp-Source: AGHT+IGp5LTDf9nALATaSVGPtOxssSiLR/V1qZdAhbCJxMJjQpzx3iN0/0oJPilkWq6sFqIXs0ngFg== X-Received: by 2002:adf:f605:0:b0:32d:89b5:7fd9 with SMTP id t5-20020adff605000000b0032d89b57fd9mr19790945wrp.56.1699209719987; Sun, 05 Nov 2023 10:41:59 -0800 (PST) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id z17-20020a5d44d1000000b00326b8a0e817sm7370111wrr.84.2023.11.05.10.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 10:41:59 -0800 (PST) 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_Conor_Dooley_?= =?unknown-8bit?q?=3Cconor+dt=40kernel=2Eorg=3E=2C_Chen-Yu_Tsai_=3Cwens=40cs?= =?unknown-8bit?q?ie=2Eorg=3E=2C_Jernej_Skrabec_=3Cjernej=2Eskrabec=40gmail?= =?unknown-8bit?q?=2Ecom=3E=2C_Samuel_Holland_=3Csamuel=40sholland=2Eorg=3E?= =?unknown-8bit?q?=2C_Hector_Martin_=3Cmarcan=40marcan=2Est=3E=2C_Sven_Peter?= =?unknown-8bit?q?_=3Csven=40svenpeter=2Edev=3E=2C_Alyssa_Rosenzweig_=3Calys?= =?unknown-8bit?q?sa=40rosenzweig=2Eio=3E=2C_Julius_Werner_=3Cjwerner=40chro?= =?unknown-8bit?q?mium=2Eorg=3E=2C_Evan_Benn_=3Cevanbenn=40chromium=2Eorg=3E?= =?unknown-8bit?q?=2C_Florian_Fainelli_=3Cflorian=2Efainelli=40broadcom=2Eco?= =?unknown-8bit?q?m=3E=2C_Broadcom_internal_kernel_review_list__=3Cbcm-kerne?= =?unknown-8bit?q?l-feedback-list=40broadcom=2Ecom=3E=2C_Maxime_Ripard_=3Cmr?= =?unknown-8bit?q?ipard=40kernel=2Eorg=3E=2C_Oleksij_Rempel_=3Clinux=40rempe?= =?unknown-8bit?q?l-privat=2Ede=3E=2C_Justin_Chen_=3Cjustinpopo6=40gmail=2Ec?= =?unknown-8bit?q?om=3E=2C_=82ecki__=3Crafal=40milecki=2Epl=3E=2C_Baruch_Sia?= =?unknown-8bit?q?ch_=3Cbaruch=40tkos=2Eco=2Eil=3E=2C_Ahmad_Zainie_=3Cwan=2E?= =?unknown-8bit?q?ahmad=2Ezainie=2Ewan=2Emohamad=40intel=2Ecom=3E=2C_Marc_Zy?= =?unknown-8bit?q?ngier_=3Cmaz=40kernel=2Eorg=3E=2C_Linus_Walleij_=3Clinus?= =?unknown-8bit?q?=2Ewalleij=40linaro=2Eorg=3E=2C_Jamie_Iles_=3Cjamie=40jami?= =?unknown-8bit?q?eiles=2Ecom=3E=2C_linux-watchdog=40vger=2Ekernel=2Eorg=2C_?= =?unknown-8bit?q?devicetree=40vger=2Ekernel=2Eorg=2C_linux-arm-kernel=40lis?= =?unknown-8bit?q?ts=2Einfradead=2Eorg=2C_linux-sunxi=40lists=2Elinux=2Edev?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_asahi=40lists=2E?= =?unknown-8bit?q?linux=2Edev?= Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] dt-bindings: watchdog: re-order entries to match coding convention Date: Sun, 5 Nov 2023 19:41:53 +0100 Message-Id: <20231105184154.43700-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 The Devicetree bindings coding convention, as used in most of the files and expressed in Documentation/devicetree/bindings/example-schema.yaml, expects: 1. "allOf:" block just before "properties:" (or after "required:" for more complex cases), 2. additionalProperties/unevaluatedProperties at the end of the file, just before the examples section. Re-order few schemas to match the convention to avoid repeating review comments for new patches using existing code as template. No functional changes. Signed-off-by: Krzysztof Kozlowski Acked-by: Guenter Roeck Acked-by: Rob Herring --- .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 6 +++--- .../bindings/watchdog/alphascale,asm9260-wdt.yaml | 6 +++--- .../devicetree/bindings/watchdog/apple,wdt.yaml | 6 +++--- .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 6 +++--- .../devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml | 10 +++++----- .../devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml | 6 +++--- .../devicetree/bindings/watchdog/maxim,max63xx.yaml | 8 ++++---- .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 10 +++++----- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index 274519fc24fd..64c8f7393809 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -6,13 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Allwinner A10 Watchdog -allOf: - - $ref: watchdog.yaml# - maintainers: - Chen-Yu Tsai - Maxime Ripard +allOf: + - $ref: watchdog.yaml# + properties: compatible: oneOf: diff --git a/Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml b/Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml index fea84f5b7e6d..6425fe51d20c 100644 --- a/Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Alphascale asm9260 Watchdog timer -allOf: - - $ref: watchdog.yaml# - maintainers: - Oleksij Rempel +allOf: + - $ref: watchdog.yaml# + properties: compatible: const: alphascale,asm9260-wdt diff --git a/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml b/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml index 929681127df0..21872e15916c 100644 --- a/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Apple SoC Watchdog -allOf: - - $ref: watchdog.yaml# - maintainers: - Sven Peter +allOf: + - $ref: watchdog.yaml# + properties: compatible: items: diff --git a/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml b/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml index b5573852ef5a..8e9d0b7e8244 100644 --- a/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: ARM Secure Monitor Call based watchdog -allOf: - - $ref: watchdog.yaml# - maintainers: - Julius Werner +allOf: + - $ref: watchdog.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml index 526ff908d134..e898167ef628 100644 --- a/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml @@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: BCM63xx and BCM7038 watchdog timer -allOf: - - $ref: watchdog.yaml# - maintainers: - Florian Fainelli - Justin Chen - Rafał Miłecki +allOf: + - $ref: watchdog.yaml# + properties: compatible: enum: @@ -29,11 +29,11 @@ properties: The clock running the watchdog. If no clock is found the driver will default to 27000000 Hz. -unevaluatedProperties: false - required: - reg +unevaluatedProperties: false + examples: - | watchdog@f040a7e8 { diff --git a/Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml b/Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml index 1844d7e026fe..13236ee61f6f 100644 --- a/Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml @@ -12,12 +12,12 @@ description: | timer counters. The first timer (called "Timer A") is the only one that can be used as watchdog. -allOf: - - $ref: watchdog.yaml# - maintainers: - Baruch Siach +allOf: + - $ref: watchdog.yaml# + properties: compatible: const: cnxt,cx92755-wdt diff --git a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml index 1a6490c43d89..442c21f12a3b 100644 --- a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml +++ b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml @@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Maxim 63xx Watchdog Timers -allOf: - - $ref: watchdog.yaml# - - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml# - maintainers: - Marc Zyngier - Linus Walleij +allOf: + - $ref: watchdog.yaml# + - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml index 76eceeddd150..c7aab0418a32 100644 --- a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml @@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Synopsys Designware Watchdog Timer -allOf: - - $ref: watchdog.yaml# - maintainers: - Jamie Iles +allOf: + - $ref: watchdog.yaml# + properties: compatible: oneOf: @@ -73,13 +73,13 @@ properties: minItems: 16 maxItems: 16 -unevaluatedProperties: false - required: - compatible - reg - clocks +unevaluatedProperties: false + examples: - | watchdog@ffd02000 {