From patchwork Mon Dec 12 17:49:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2381399wrr; Mon, 12 Dec 2022 09:57:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf5EwzOM5rC9kxzy69V9y1gsT2UHTr32hPqM1hikvoepUDnh9u9vty0i0B1nYnijuOs5AAjA X-Received: by 2002:a17:90a:a012:b0:219:b034:941c with SMTP id q18-20020a17090aa01200b00219b034941cmr17234208pjp.18.1670867844207; Mon, 12 Dec 2022 09:57:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670867844; cv=none; d=google.com; s=arc-20160816; b=Os/0nq5HWzR5kd09RVu6YMmqfJVHiIsUut9XEb51EbsF/VG2/AN3oq+gggdsUGx3hB jylwlMOlwKzdU3NgJ071p25Hiz+ZFoLBsF5SeqQdktqpjZ4aPUUUC3OMM2nJrN2rnRww WM1a74xpHYu/9rOWbsKtsdgvISv2DBFb68azcRNZhlZRqkd4s9P29vk/uRI60Rkd6xE3 8z32qrMPwKl3uRdAjWAd3auHbIQPpF0ln/v86qK4a3NozlrNlRlLKWO6uYp9CxCNjwvl wRQcMdSA/+eoZoRGs7u5r62DDWUH34/307b+ameEQpzI574tocVEhr1buajAlNG0Dh6C Zq/w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=wvsMVvtThL8gMv7LQ3fpmievE9cnCujmolAZoIZFwM0=; b=eODb56BSIvr0rNg+3wi4suf1TeSSyenGxQwxa7P8VR7SFKlotJy0XB2mKRXAN9Frr4 9rsjv5eiTyOvfcJw890PtXptiOImqvClK5payURvB19lTHHlZAACB424Oc9+KndwUoEk I0VTIrr1dWQ928C6hbE9iH9tGZ0KfhGnQlB/O86DBchpiR8serYMb2BRgktfky2b/CGx Sf0GnWGclER9ltI4pN3fjqqdWuz3E+Y0wnOT2F6rDK1TBvraEASWjMUFkg7FCPAFbpoT YKPFgzBs1hRzuj2af0rrRXJcgciT9qHmDIqWyvbu351P446vC1aR9dtf4H6Jpxllqf5B O+2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p7hlMr7w; 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 l23-20020a63ba57000000b00476d6927ba2si10118061pgu.659.2022.12.12.09.57.11; Mon, 12 Dec 2022 09:57: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=p7hlMr7w; 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 S232713AbiLLRuy (ORCPT + 99 others); Mon, 12 Dec 2022 12:50:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232706AbiLLRuv (ORCPT ); Mon, 12 Dec 2022 12:50:51 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCB3F592 for ; Mon, 12 Dec 2022 09:50:50 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id p8so652315lfu.11 for ; Mon, 12 Dec 2022 09:50:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wvsMVvtThL8gMv7LQ3fpmievE9cnCujmolAZoIZFwM0=; b=p7hlMr7wM3wyuA9xtFlMfUZP4AXHjSiNRsW14oK0LRr8bGQ7wMzch9VO83Cl6nSrlo sLVcnRMsi6l7+x6uxr0I2uwvRvTAjItkiYxSBTNOS45zuoRMRhynjnNeFpboAwdsV2N1 eaD2TT7VByDxJqP71GAwWwc4b0nbZqYjw40s04lDRyETX5hVzyhiIsd0jIVfXyKKnSYj OtGg535FPBztb1Tq92x7ir3gpuV2mor9kQsGLgV7rBdEuEpU4t3O3XafJD06ibu1BMTi 1dVKdONoBxtusBQPtFzVR78DTHDFK6Tqs7mytgM+/hlqwu+565pTulNWNvj41egQjWLr N1xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wvsMVvtThL8gMv7LQ3fpmievE9cnCujmolAZoIZFwM0=; b=x/iNbEN708d16ToMZTTUfsBpFiLRR2q1oz1LxpRp3J+mkMglWwWeiucRuJU690a77w VIwDc+omRcNgwAUKPyq/CPmsGWFcMtakFk8//ZJalpwZVEqeTaH7xbdRMcLA5bcIanWy R2jrZx7aPykcGfvzG4h3187sCG/9VX3Ioq26KI2zkdon96t6Kgc4p7PmLPWS3wf5UORX wy81I/FR3JZaKA8xWzXrBktj/ac9M+YbhSd5NHDGCfWZje4pu4+ovWyH1whlULpDji6L fv8P0hdKWq3CmxpXt/gdkKYqlegkXR5b7mwOeCUMDccM1LYgYW2oXJtjkzx3UeEu4pIB JUyA== X-Gm-Message-State: ANoB5pmRZUCHsA/WtbeZHtpvqYq9axbLsGkscrhHgACiSg4DZ1noHgBj sxk+uXC1JCt9RiFiqrl+ootA1A== X-Received: by 2002:a05:6512:21b:b0:4b5:5098:e6f7 with SMTP id a27-20020a056512021b00b004b55098e6f7mr3642514lfo.68.1670867448686; Mon, 12 Dec 2022 09:50:48 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id j6-20020ac25506000000b004b53eb60e3csm44094lfk.256.2022.12.12.09.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 09:50:48 -0800 (PST) From: Krzysztof Kozlowski To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: watchdog: allow "timer" as node name Date: Mon, 12 Dec 2022 18:49:33 +0100 Message-Id: <20221212174933.208900-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 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=unavailable 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?1752031920707258430?= X-GMAIL-MSGID: =?utf-8?q?1752031920707258430?= 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 --- 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 e3dfb02f0ca5..b1daefec86af 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: