From patchwork Fri Jan 13 10:33:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 43145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp195690wrt; Fri, 13 Jan 2023 02:39:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXs1COYVopSPXKwJyKLqwTrJ2PUHLCYAlAP4Dcwm5QGWNCAST5SYAvMOrwnWL2+8cJDSea9S X-Received: by 2002:a17:906:bc47:b0:78d:f455:3110 with SMTP id s7-20020a170906bc4700b0078df4553110mr61630636ejv.56.1673606364981; Fri, 13 Jan 2023 02:39:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673606364; cv=none; d=google.com; s=arc-20160816; b=fgkJ/GkgjoMM14yYgzLH1fS1hi+DN/QUGVlVyLRzZv7ICc6J1DM7MxjOXlC8iUv/OA 3JYyzJLcLeO9MtDgT9rbzsfrLmHMnTTIdYh4847FPjUt/i6ykHlbn+oIMVHlF2IeGSkK I99C+CL4phx+iYrBX7VK+cAqt3/uuSNTMxUuahif1oaKbyrcgw4IA927oPkZg0gQjEa/ oD2GPObgcerDN8N4vwU57Mml2y2AocRANfz2DM2o6Yy8eM6KvBVlHRk3Pne8zsdkkwF6 ljOexX/9yPdh9h0jjyjiOunwYHaDVq79RtJTeL9KOcbW+xQx7ski0Zj/jabGPMtt/i2x YR3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=o7WPzmC5Oh9izsU3TrE1uZKgp8/c5G7tROX6eiyHIgY=; b=T4Hy/g7WmgvEngy4MJQjMqXK5I43kthrHxMMneN+25qpuEZxfmbNRI6WCbTPMu0Tz8 fDE4GnHOpaygjIh78KTPNnqDYAjvMD1R7h0ZfHbAn9v+X5bFmdHYr+aqgyTFKFSddUs/ 02aQwp5XmO7VARwINDwcWvAIaIArtUZqA+gHLdnqx1dC7vwLIk3tyDyMzHLByJ+HOnRu 6zyrqX+Cj3ZnxIgtoxqRphiMhytOTUD7aqyIBjb9ffy9qnsbeleI8yXPC+KuICZsmXIe QZG39aSBm37QhgpKMdDHsF2v1TcpCqz+QySepWHi6Dt2+LJ1+6Ao8mOABq9rZ2EVdkC4 6PIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TeWE7d6J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hq25-20020a1709073f1900b008672552b4c9si4865640ejc.38.2023.01.13.02.39.00; Fri, 13 Jan 2023 02:39:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TeWE7d6J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241152AbjAMKel (ORCPT + 99 others); Fri, 13 Jan 2023 05:34:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241124AbjAMKeV (ORCPT ); Fri, 13 Jan 2023 05:34:21 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1E5242E0E for ; Fri, 13 Jan 2023 02:34:03 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id qk9so51319918ejc.3 for ; Fri, 13 Jan 2023 02:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o7WPzmC5Oh9izsU3TrE1uZKgp8/c5G7tROX6eiyHIgY=; b=TeWE7d6JnqZbN8f0RMGiOR8UR8ssrwm7OglihKaBgLd7Zwov8JU2YVGMpBiXL5PlP7 brgA2vuVJR81uYIpAQG2BFQhYVaMfkdJmeCsxAiGUWMLIveM6pIGt9tFoegtyJz2ECHS Ss4OuCKOUX03eD0Nk1CBeSjMefLZzEN4vdPy9nzXfof1HyCeDxivxr1nZ561h2wPKTUU uYC7qiyHuolm/Ps5PjqD1vEOEmU1DK2bz2eRyg0Lq1TtCuaXXVpW8tOjhIMTyq16uw0E 74WEkWHIWjgQMHpr9/ydQcv3zVT2bbFluz5s0CCHt2ixTYk/3/rZ4e08Bziwnl9TgDo+ j4mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o7WPzmC5Oh9izsU3TrE1uZKgp8/c5G7tROX6eiyHIgY=; b=D58sHXl/gViJSUgUWWjG081ioDy2dUb5ldBo2eSC4GPX2ez/DBcX7/dNBS9axgfc5j N4hQxkPDxTEyOcPH9QDzrZuAO/ZWc7qcjVOghZpkZiEvu82ezxOL3W9kTxRtSSr18RxK UWU1TvqHfAAN3qvaSSwzJjL8t39WMkbFRSyiZhv4sD/O/YplGIBYg7pauK+2Qoq78n5+ TxktN8hm2q9y1YfSlfnbyfIwrMv4cFN7KbwPlxFwpIZbfjTov7u2KzOmDLsQKXsW6rby 9ufwEXUXk9ypV4HzmkmcDYZWXAmtC4L3YBohpGKvnIUrMyda3W5auJTgC1H5hbY1LMSv v5rA== X-Gm-Message-State: AFqh2krlzD5YavyGDiWqxnm0aqhmVmLRqF4oBdROAIUvtEkNVFjJz/au Iga589pRuEyDiX5O944RhpzEeA== X-Received: by 2002:a17:906:281b:b0:7c1:5863:f8c4 with SMTP id r27-20020a170906281b00b007c15863f8c4mr65076391ejc.21.1673606043565; Fri, 13 Jan 2023 02:34:03 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:34:03 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Daniel Lezcano , Thomas Gleixner , Rob Herring , Krzysztof Kozlowski , Wim Van Sebroeck , Guenter Roeck , Prakash Ranjan , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 7/7] dt-bindings: watchdog: allow "timer" as node name Date: Fri, 13 Jan 2023 11:33:46 +0100 Message-Id: <20230113103346.29381-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113103346.29381-1-krzysztof.kozlowski@linaro.org> References: <20230113103346.29381-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754903467634161934?= X-GMAIL-MSGID: =?utf-8?q?1754903467634161934?= On some SoCs the watchdog device is actually mixed with timer, e.g. the qcom,msm-timer on older Qualcomm SoCs where this is actually one hardware block responsible for both system timer and watchdog. Allow calling such device nodes as "timer". Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. See also: https://lore.kernel.org/linux-arm-msm/20221212163532.142533-1-krzysztof.kozlowski@linaro.org/T/#t which causes warnings: qcom-msm8960-cdp.dtb: timer@200a000: $nodename:0: 'timer@200a000' does not match '^watchdog(@.*|-[0-9a-f])?$' From schema: Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml --- Documentation/devicetree/bindings/watchdog/watchdog.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/watchdog.yaml b/Documentation/devicetree/bindings/watchdog/watchdog.yaml index fccae0d00110..519b48889eb1 100644 --- a/Documentation/devicetree/bindings/watchdog/watchdog.yaml +++ b/Documentation/devicetree/bindings/watchdog/watchdog.yaml @@ -14,9 +14,14 @@ description: | This document describes generic bindings which can be used to describe watchdog devices in a device tree. +select: + properties: + $nodename: + pattern: "^watchdog(@.*|-[0-9a-f])?$" + properties: $nodename: - pattern: "^watchdog(@.*|-[0-9a-f])?$" + pattern: "^(timer|watchdog)(@.*|-[0-9a-f])?$" timeout-sec: description: