From patchwork Fri Jan 13 10:33:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100448 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 D986AC678D6 for ; Fri, 13 Jan 2023 10:33:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240196AbjAMKd4 (ORCPT ); Fri, 13 Jan 2023 05:33:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240730AbjAMKdy (ORCPT ); Fri, 13 Jan 2023 05:33:54 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 404D73C39A for ; Fri, 13 Jan 2023 02:33:53 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id fy8so51178659ejc.13 for ; Fri, 13 Jan 2023 02:33:53 -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=bYOqqTk6W0WcbF3/QFz8WMheMJbLViofomUPeNUrXjM=; b=yWEwQ8+yBSI7+C+2uY0UASWBa3ZZHy3UUeQhIVUvZbJNDoDSjzqt9pcIdy5vohkSoE SxvsLCAANjoXcgweqHR++3P3/e8yrB5z8MGKfmPq2ZVfLMBmdewfKRSHj1F3/nSnkpWx ZHm0kC5w2iC1SKa+d8jBMLDA6DCDWIXodoiIY5bRHx8rjLjwtV8COsLJc8zbWL3Pdowh NDZ1f0NStjG0bPXSURiOY3K/GT9vnSUDsDGdGbp/39RVKk2SFMEMeB/GrJTS6rfvjzXC aLgT5eur7ulGq8Ot58hoJpu0G7PYZ8xSuOzTejQV0LMhNAeDfuzbLtyehKRROUdo2Elh noyQ== 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=bYOqqTk6W0WcbF3/QFz8WMheMJbLViofomUPeNUrXjM=; b=6g8wjypGD6+2yf8lRwAwPsGn7d1ELx10DT+S3zdA9Sc78zxjb5HtsC0prjUMQit6Bi +NJUfnlElErzDIxCyJFgJYtZL7L0We+9EL5te52135unTx4JSa6Mj3AUraMfuvv3MjOc m5foap7NGoA1tEiwTZFJ7GVnoenfHgPre6xRkyVABfneRNxsOwEB9HKstvO8i8mSaXhq PxqXqZ8D94O5Ac45fHDfmptVQ5WEymXa7yShTbCNaAnNn2wQgCvnXKL4IHpACD2/sYNj 651zQaDgtXG7rCrEnjlxs/mrRGn+ycskyJOCFCRosvsD/HAwBMQ/dGg3SWM+b3gfzj5m wxXg== X-Gm-Message-State: AFqh2kpLTMbxdYAFFepuePqyQPiFqxLPljY3ScHq1rGmIlZB5d2R1eEP l9SuETNJHhKn9f1sPdbXk3tm0w== X-Google-Smtp-Source: AMrXdXv/ET3OjcfkK4iBVg3ov5aALx5HQAP7NF6nSOUQ1AHdNtC05OscMma3EhHqFBoxKiKmIrwmUQ== X-Received: by 2002:a17:906:c18f:b0:7f7:a4ed:f2d4 with SMTP id g15-20020a170906c18f00b007f7a4edf2d4mr2638607ejz.77.1673606031860; Fri, 13 Jan 2023 02:33:51 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:33:51 -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 1/7] dt-bindings: watchdog: qcom-wdt: require fallback for IPQ4019 Date: Fri, 13 Jan 2023 11:33:40 +0100 Message-Id: <20230113103346.29381-2-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The device specific compatibles ("qcom,kpss-wdt-ipq4019") should be follwed by fallback "qcom,kpss-wdt", which is actually used by Linux driver for binding. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. --- Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index a1f17c9e02db..e76364c52fc7 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -17,6 +17,7 @@ properties: oneOf: - items: - enum: + - qcom,kpss-wdt-ipq4019 - qcom,apss-wdt-msm8994 - qcom,apss-wdt-qcs404 - qcom,apss-wdt-sc7180 @@ -35,7 +36,6 @@ properties: - qcom,kpss-wdt - qcom,kpss-timer - qcom,kpss-wdt-apq8064 - - qcom,kpss-wdt-ipq4019 - qcom,kpss-wdt-ipq8064 - qcom,kpss-wdt-msm8960 - qcom,scss-timer From patchwork Fri Jan 13 10:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100450 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 F05D4C678D7 for ; Fri, 13 Jan 2023 10:33:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240773AbjAMKd6 (ORCPT ); Fri, 13 Jan 2023 05:33:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240696AbjAMKd4 (ORCPT ); Fri, 13 Jan 2023 05:33:56 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53F753C0E3 for ; Fri, 13 Jan 2023 02:33:55 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id i15so30606466edf.2 for ; Fri, 13 Jan 2023 02:33:55 -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=ZF5sd3g90f4Qs9P874U5YVELS2KTcI0WZKZFpvAbkiE=; b=DNTWY+vB8ko4GcShIXaNoBteQKEzG75KC+7zd88VfoNlC3yqjtzwQt3vvuo4j+IHcd qw3CwofXjgi4ABZHQXCKx4VOJ56bvSWI9RJPF9d65tOcjkgRM6R0KDdGTr8VTOGs7rLT vUIikdT8nKJt0fXy1/5ekH4Qk5RkBl1p+PtN/+JnQLZSImFUrKrr43b57Xvm0/3AVSxi 1/p6HfENmvEolWu1PU6vPC+kUWfJBb7nj08QtxVf1iTuQZSNYEG0xvXsSuRqPhJYq6a8 h2oRSHww3lnRU6/r4yLS5L4wFEXCX6JGMO6j/LLUR3hN08D709pfyEwB2Nk4ssh5d1ZZ 1apg== 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=ZF5sd3g90f4Qs9P874U5YVELS2KTcI0WZKZFpvAbkiE=; b=F0rW9uKWi5A/ohqAIOPhuD2FhXqbXSWUhGRDujLh9S3XXFoqzE54AKdZiVX7t/89T5 nUobDQmkXWLn5s4ipPqIFQkpRE4l8cz2NQcHm24KaYU1QR7lagHtaQCpU/SFrN/sLIUv XMNnG1CLq7Ff2LOAizZdSVR2QmMwRtqN+sdzHG/z89cnEt3mZXhigjtQeS6hvKaTwzH0 adCsslJbZ5ho7kC7DUAl6K6ZGB8o4+VTw6GD8VqUBqoTeuz7OtfKYOeGGrkOj44zpiV4 lOHkyCnVsxwvvw27I8lKsyK7/xtHue6uAFGhopCelkaMmJrJIXoRN4DWqTsfD539FNm1 wFlw== X-Gm-Message-State: AFqh2krKnXn4wE1nZ2C32xebvghkhy5VjefG9QqPyl6vc6a64e5iAsBJ rVXwnzTx6DmIjwPGG6dEMYvjyQ== X-Google-Smtp-Source: AMrXdXtJHIGMoGTv1v8iyljqehkQmmjHKgbw9OX6IrpnE8vM1b88k42aejnsCLT6NqBpsqezs7s/qQ== X-Received: by 2002:aa7:da0e:0:b0:49b:58ca:ebbc with SMTP id r14-20020aa7da0e000000b0049b58caebbcmr5045375eds.32.1673606033893; Fri, 13 Jan 2023 02:33:53 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:33:53 -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 2/7] dt-bindings: watchdog: qcom-wdt: do not allow fallback alone Date: Fri, 13 Jan 2023 11:33:41 +0100 Message-Id: <20230113103346.29381-3-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The compatible "qcom,kpss-wdt" is too generic and should not be used alone. Mark it as deprecated when not prepended by specific compatible. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. --- Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index e76364c52fc7..3e0b30a817d6 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -31,9 +31,10 @@ properties: - qcom,apss-wdt-sm8150 - qcom,apss-wdt-sm8250 - const: qcom,kpss-wdt + - const: qcom,kpss-wdt + deprecated: true - items: - enum: - - qcom,kpss-wdt - qcom,kpss-timer - qcom,kpss-wdt-apq8064 - qcom,kpss-wdt-ipq8064 From patchwork Fri Jan 13 10:33:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100451 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 232F8C678DA for ; Fri, 13 Jan 2023 10:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240696AbjAMKd6 (ORCPT ); Fri, 13 Jan 2023 05:33:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240887AbjAMKd5 (ORCPT ); Fri, 13 Jan 2023 05:33:57 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25C663C39A for ; Fri, 13 Jan 2023 02:33:56 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id vm8so51290808ejc.2 for ; Fri, 13 Jan 2023 02:33:56 -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=lC87lbi3Kix1/WTr6zTXwuAcw9PYl2E9b9lmeuRXx74=; b=iLUQ/VIDzCMYYUpP2NCWz1zh2HYJwz/kLaPZjR0ielr/eEO2FL81rphdmYz1Qc6rU1 KP6dWMOcacq6PiX6UyY/yYf3m9AKLefD0KNqcjevL3a9XJKfRNmCUDVaE+Ym5DI1DkW1 0mHVxMTpB6PVADFl9CxY0wOdxUIg56VlP4Kr7EmGBSe9qzxhTfltX0qVcCnnZW2JypOC 5r8kSbFRaUusKALy4DNcoC1DIz7ORfnlmSdqODYpqLgInNKgPhNJlL7iBwIh1NC0DCNW 4syGlTD1GzF+HKpjl0syKTWU4uusJuZ/vdWnDYIf7P7wuJegYXvAhYQgW8RpCznHn39c 9Bcg== 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=lC87lbi3Kix1/WTr6zTXwuAcw9PYl2E9b9lmeuRXx74=; b=8LApyjOmeocQut+sloap1oZI+Y+vqsCVMOgDXm7fuqIFNzUKY6VUAfR6VPD+7pJU/T peCP9lS2DaajEZijEMd0PGyHT1GzFlc6KsQnQnga301NIQIkMRDQsgwz/M2zIIgeZRQh UhFmeMuRhy0ttxMrKKnVE3XbEqCD9FIc+3BXgZ8ptyHx2Wrrr9ZijfHY0z6o9ljAWBeM rh/Kr7GNPEIiQ9Wp+zgsNN66uuvvfMvX88KCmsgDKTT2HL4GmJETsfepcEemBdMG812L 0Jl04sGhVd1K6Ymkp5Dp7HuGxSZMMbSd5Snq8n6fyZCQctkeQcjtbiUrxrmgxj5+IQOF /qeg== X-Gm-Message-State: AFqh2kqTHJ2SXt+s0TdfyjNEsJc5fZgFozvcv3IZC6f4zw3ReqTQwV63 cWl81WnFzB6L5RxyzfnwvUu3Aw== X-Google-Smtp-Source: AMrXdXsbBzg83GbOBY6A3ZILRYqJbcovs5RxB+a4gZsXMO2UEt+aOlqgpY5N7aFPAMjW4eMIGVdkKA== X-Received: by 2002:a17:907:d10f:b0:83f:cbfd:31a9 with SMTP id uy15-20020a170907d10f00b0083fcbfd31a9mr62188273ejc.47.1673606035761; Fri, 13 Jan 2023 02:33:55 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:33:55 -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 3/7] dt-bindings: watchdog: qcom-wdt: fix list of MSM timer compatibles Date: Fri, 13 Jan 2023 11:33:42 +0100 Message-Id: <20230113103346.29381-4-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org The MSM timer ("qcom,msm-timer") is a bit different timer and watchdog device than KPSS watchdog. It has its own generic and specific compatibles, so fix the list to reflect this. Adjust the example to show the newer KPSS watchdog. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. --- .../devicetree/bindings/watchdog/qcom-wdt.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index 3e0b30a817d6..93e4381067dd 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -33,13 +33,16 @@ properties: - const: qcom,kpss-wdt - const: qcom,kpss-wdt deprecated: true + - items: + - const: qcom,scss-timer + - const: qcom,msm-timer - items: - enum: - - qcom,kpss-timer - qcom,kpss-wdt-apq8064 - qcom,kpss-wdt-ipq8064 - qcom,kpss-wdt-msm8960 - - qcom,scss-timer + - const: qcom,kpss-timer + - const: qcom,msm-timer reg: maxItems: 1 @@ -56,9 +59,11 @@ unevaluatedProperties: false examples: - | - watchdog@208a038 { - compatible = "qcom,kpss-wdt-ipq8064"; - reg = <0x0208a038 0x40>; + #include + + watchdog@17c10000 { + compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; + reg = <0x17c10000 0x1000>; clocks = <&sleep_clk>; timeout-sec = <10>; }; From patchwork Fri Jan 13 10:33:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100452 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 6F1DDC54EBD for ; Fri, 13 Jan 2023 10:34:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240698AbjAMKeQ (ORCPT ); Fri, 13 Jan 2023 05:34:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240782AbjAMKd7 (ORCPT ); Fri, 13 Jan 2023 05:33:59 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 166233C38A for ; Fri, 13 Jan 2023 02:33:58 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id vm8so51291022ejc.2 for ; Fri, 13 Jan 2023 02:33:58 -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=Pfc3GUmZnP2RdKEy7GTwIqjEf+awPwSAK/Qmsi/Wfvs=; b=egnJS1opNATsMNWsXs7JeuZ67px6IjkvzBCPIKOmikFcQf3MJT18MqBWPWfCXo99wR qpALckRxPTqDrMI/FsFfI5NoeKo2mqk69ctEdOTW4nGxNJSldP/B/P6IvmXJL62WLaVD PEMczugAckb6HqEy2e/Jsf4EFP3+ed5tuYizWejPkXd0uQdQehwk1DlMqeYgdoJLctqv Gob6eL1+N3nGQ650OtSzc9LfxXCHsHTGD8STKeo2TYnnS5JlOJr3mD1EVFtEdBJM7Qeo qlt2OtKcquJSHXNrbyka4U3t3m5SufDxIaCKwkEz7XgF7/KXvErOqoSVKf6sDr5xhqGR 8Kew== 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=Pfc3GUmZnP2RdKEy7GTwIqjEf+awPwSAK/Qmsi/Wfvs=; b=agnxvRqo0+7YIjcpB8WXCw/cuRZh//G7HGf4fQoLOjdcujuQeocAFRWCiJEcWu6mAG xxQPUkxXT2auXnk+3ChStSR7+57wmCFHl6aDMxq6b+xiEQlhlphCNoivYuL4aiyH6Sa1 RZtajsys2X0C5CAFylzxx/SwCFtq8TLbaqpuLNbOox3+EJUeMA/v31FEuE5/t0ULLrjX ta2PP+nEbitH1sjMzIxu3M3eEx543b7Sag4HTL3zQTTQyFPyWyeyoUu7l9Ek2O3/H5wk uBGAO/o/z7AeoDnuGkDIaovPHERMx5eNGGKqUFRjRZXtWHXMrrG7B0x4Lk+Pov7RBorc KL+A== X-Gm-Message-State: AFqh2kpxa7yKw/EcwZ1gZPFzWVdCDexgszjc658OmW6eNeUjkrXaIeFF DOL9iGcW+Z+4x5pwDkOvag8uvA== X-Google-Smtp-Source: AMrXdXv3CQLjgv09Qjp6wfRt+2U0nEe+BwdFK51i2oADXH6X0O+xfbjp2b3IoRVxKw2+/zghiDcW+Q== X-Received: by 2002:a17:907:6748:b0:859:aca8:fe4d with SMTP id qm8-20020a170907674800b00859aca8fe4dmr3236250ejc.46.1673606037704; Fri, 13 Jan 2023 02:33:57 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:33:57 -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 4/7] dt-bindings: watchdog: qcom-wdt: add qcom,kpss-wdt-mdm9615 Date: Fri, 13 Jan 2023 11:33:43 +0100 Message-Id: <20230113103346.29381-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Document new MDM9615 qcom,kpss-wdt-mdm9615 watchdog/timer compatible. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. --- Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index 93e4381067dd..1828eaf70b3b 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -40,6 +40,7 @@ properties: - enum: - qcom,kpss-wdt-apq8064 - qcom,kpss-wdt-ipq8064 + - qcom,kpss-wdt-mdm9615 - qcom,kpss-wdt-msm8960 - const: qcom,kpss-timer - const: qcom,msm-timer From patchwork Fri Jan 13 10:33:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100453 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 CF78EC54EBD for ; Fri, 13 Jan 2023 10:34:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241159AbjAMKe0 (ORCPT ); Fri, 13 Jan 2023 05:34:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241096AbjAMKeO (ORCPT ); Fri, 13 Jan 2023 05:34:14 -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 31B6F48CEA for ; Fri, 13 Jan 2023 02:34:01 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id l22so21585982eja.12 for ; Fri, 13 Jan 2023 02:34:01 -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=67GIFM4w0hAvvXxWdOb9SiBmz/aaBvD0zgwwHWbhAi8=; b=RFBKBKDCxfLFl6eG3A7gTJgZCwDB9oRNIOCDwXHMaKnG2t/sOigSIxc57WJ7zvi8+t PtIjYzAJAU/1hMhqBXyU64gIZnAKeIcpjhqIDccrMHx+jvVwtpdblLOyjNOF2Mt4hxJu oOeC75A71pwfHkmwuI7nUQlWvbHfeu5rGzniUQ+BGmruDQ1PdIWkJLxUblB9raMEV4b1 yGwhKvGlnZx1ftkwze9aoqH/vqaVIle5hEJUJELAbKQvuk+9G7IA3el1M11rXvjudneY PkRjLhH82ThZv5BZpclePn6unU6xf4V613NACXawL+GrvN0L+ORJakRXzRLR38yGZGFz MYtQ== 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=67GIFM4w0hAvvXxWdOb9SiBmz/aaBvD0zgwwHWbhAi8=; b=QOG80Ifdvu3n7nujrUJ3RMxgcsq6oQXeg2HA2j2YuTc8OTH1IDFFZrRPIEv4Z9gQl3 dgT7XlK9W3RHs0pGRF9oZNjXJFqb6qtKfVP7rpM/dfJB50Xh+1UeWSG5CLs/y/Tt7TlG 8Ka5QuWQqcBGITWQtkKmKJ4g38L99prCp2xzlJ+LAzuPQjLCcMkfIT5tsGPgpwOez3iE eliq4Ig20kmGg4wbPVliml35Vmq9QDVr6EdDMcamNivdbPrgSTp1E4VlaNGcO4j6mt57 D4hBK2O0iXojr2ixYRdkkKbgYjDAE1T4bYxaF2NqTYLll2bd8F2GYT92FKbWLy9aGfkO uvCw== X-Gm-Message-State: AFqh2kqefKWYWd0kat41QCJdybev0W0SUOBLIwCpk22OauBa2RWl78WG XUPM50AuqCsT1ik4X6HvznFkIA== X-Google-Smtp-Source: AMrXdXu6UyZku6/JqTmo74doxjdiLkVHFgc6Q+Hfn0IedG1oehCVXgnm7vhnUbWMejUf5SBEjMjQNw== X-Received: by 2002:a17:906:eda7:b0:7c4:f402:9769 with SMTP id sa7-20020a170906eda700b007c4f4029769mr85624406ejb.76.1673606039746; Fri, 13 Jan 2023 02:33:59 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:33:59 -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 5/7] dt-bindings: watchdog: qcom-wdt: allow interrupts Date: Fri, 13 Jan 2023 11:33:44 +0100 Message-Id: <20230113103346.29381-6-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Both of type of watchdogs described in the binding (the KPSS watchdog and APSS WDT timer) have interrupts. Allow interrupts and describe them for KPSS watchdog to fix warnings like: watchdog@17c10000: Unevaluated properties are not allowed ('interrupts' was unexpected) Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring Reviewed-by: Guenter Roeck --- Changes since v1: 1. Add tag. --- .../bindings/watchdog/qcom-wdt.yaml | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index 1828eaf70b3b..b7fc57f4800e 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -9,9 +9,6 @@ title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer maintainers: - Sai Prakash Ranjan -allOf: - - $ref: watchdog.yaml# - properties: compatible: oneOf: @@ -51,11 +48,31 @@ properties: clocks: maxItems: 1 + interrupts: + minItems: 1 + maxItems: 5 + required: - compatible - reg - clocks +allOf: + - $ref: watchdog.yaml# + + - if: + properties: + compatible: + contains: + const: qcom,kpss-wdt + then: + properties: + interrupts: + minItems: 1 + items: + - description: Bark + - description: Bite + unevaluatedProperties: false examples: @@ -66,5 +83,6 @@ examples: compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; reg = <0x17c10000 0x1000>; clocks = <&sleep_clk>; + interrupts = ; timeout-sec = <10>; }; From patchwork Fri Jan 13 10:33:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13100454 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 9EC7BC54EBD for ; Fri, 13 Jan 2023 10:34:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241214AbjAMKeb (ORCPT ); Fri, 13 Jan 2023 05:34:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241114AbjAMKeP (ORCPT ); Fri, 13 Jan 2023 05:34:15 -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 0E5334F138 for ; Fri, 13 Jan 2023 02:34:02 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id ss4so44038716ejb.11 for ; Fri, 13 Jan 2023 02:34:01 -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=+Gyn9HlBhvG4T1CTbJfaQi/2bfhTMYRBumH9jkT1kFo=; b=Dirg2tpLP8+rcNqEkyKVP6uRTQeGQGRa4uG2INybsbvSSXfqjmMb0/S+oki+yIiT8y 77gAnDPyH8DPq5FypF6XwFUD9ZnnPf3tT6G4KELGve2xLKpf4rPKIJcMHe+MfQWievwF sI7rOQtxcqsxq0vMkpe0zTrD7dZ/tiPzmUCjD//EFNZaBJkYG/qtC+YA2saJ5nubNuH7 /qPO/xthLIpBV2JPvUnXOKZhXWSQ3SbDooL69c0ii/uRATbOUZYMrj0MpX2+M4/n0EnX czZH/BrMx036PUOKqmL9Yr0RQWFKVyvOw5RCuxZSzOjdz4dopJ5N3mg90J80FvVwb3N5 NOFA== 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=+Gyn9HlBhvG4T1CTbJfaQi/2bfhTMYRBumH9jkT1kFo=; b=xvrvPhdBRrJ/dXG/OXUvJNXbFl8U9rctfMzcaURciReb+aXTmDA+KP4yvPxSOa9Yeh JitOuBLtJ93ROJ2bEPos70OMmiBTcqK2UG1CQcjrB6IuHeVM8G+zCQq/MOTl2n07so5K 6kPdB3o2fYw5c/xNoUxCU9a+HzKHcfc5MEnlHwRyEtyt36gsGvilAr1DDZKkJhIkCsp1 y+pHB7OKUP3LUOshju1Akg7vT5Y05yHe8dvPgmHH2Ar6WG2xHK7teEOeGgEWH9BZz/oJ gb1nu2Jvu32dy7r4qdb7p3LYzrpMh+FV1t5Dqcl1r2yAWX/7mZ6iLP/J5o9Gn/a6Ppf6 hn1w== X-Gm-Message-State: AFqh2koABRqaGfIL6gfxsDOtRbGVZfPf+QoR2VK6KQIXI92Hvn8hMA7u kxhCHpTPf9+N+ibWU22FqXUkIg== X-Google-Smtp-Source: AMrXdXuQvabCkxOh7cAxMXM4m2p4oeMARrjXif6sQoJ3LgBjWJMi3vYQ1AMC8eD/VWTBhI0JdvyAIw== X-Received: by 2002:a17:907:8e93:b0:7ae:bfec:74c7 with SMTP id tx19-20020a1709078e9300b007aebfec74c7mr73244720ejc.72.1673606041624; Fri, 13 Jan 2023 02:34:01 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id qw25-20020a1709066a1900b007ae1e528390sm8296926ejc.163.2023.01.13.02.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 02:34:01 -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 Subject: [PATCH v2 6/7] dt-bindings: watchdog: qcom-wdt: merge MSM timer Date: Fri, 13 Jan 2023 11:33:45 +0100 Message-Id: <20230113103346.29381-7-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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Merge Qualcomm MSM timer bindings into watchdog, because the timer compatibles are already included here and the hardware is quite similar. While converting the MSM timer bindings, adjust clock-frequency property to take only one frequency, instead of two, because: 1. DT schema does not allow to frequencies, 2. The Linux timer driver reads only first frequency. Signed-off-by: Krzysztof Kozlowski Acked-by: Daniel Lezcano Reviewed-by: Guenter Roeck Reviewed-by: Rob Herring --- Changes since v1: 1. Add tag. 2. Correct clock-frequency description (Rob). --- .../bindings/timer/qcom,msm-timer.txt | 47 ------------------ .../bindings/watchdog/qcom-wdt.yaml | 49 +++++++++++++++++++ 2 files changed, 49 insertions(+), 47 deletions(-) delete mode 100644 Documentation/devicetree/bindings/timer/qcom,msm-timer.txt diff --git a/Documentation/devicetree/bindings/timer/qcom,msm-timer.txt b/Documentation/devicetree/bindings/timer/qcom,msm-timer.txt deleted file mode 100644 index 5e10c345548f..000000000000 --- a/Documentation/devicetree/bindings/timer/qcom,msm-timer.txt +++ /dev/null @@ -1,47 +0,0 @@ -* MSM Timer - -Properties: - -- compatible : Should at least contain "qcom,msm-timer". More specific - properties specify which subsystem the timers are paired with. - - "qcom,kpss-timer" - krait subsystem - "qcom,scss-timer" - scorpion subsystem - -- interrupts : Interrupts for the debug timer, the first general purpose - timer, and optionally a second general purpose timer, and - optionally as well, 2 watchdog interrupts, in that order. - -- reg : Specifies the base address of the timer registers. - -- clocks: Reference to the parent clocks, one per output clock. The parents - must appear in the same order as the clock names. - -- clock-names: The name of the clocks as free-form strings. They should be in - the same order as the clocks. - -- clock-frequency : The frequency of the debug timer and the general purpose - timer(s) in Hz in that order. - -Optional: - -- cpu-offset : per-cpu offset used when the timer is accessed without the - CPU remapping facilities. The offset is - cpu-offset + (0x10000 * cpu-nr). - -Example: - - timer@200a000 { - compatible = "qcom,scss-timer", "qcom,msm-timer"; - interrupts = <1 1 0x301>, - <1 2 0x301>, - <1 3 0x301>, - <1 4 0x301>, - <1 5 0x301>; - reg = <0x0200a000 0x100>; - clock-frequency = <19200000>, - <32768>; - clocks = <&sleep_clk>; - clock-names = "sleep"; - cpu-offset = <0x40000>; - }; diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml index b7fc57f4800e..837ce9112071 100644 --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml @@ -10,6 +10,9 @@ maintainers: - Sai Prakash Ranjan properties: + $nodename: + pattern: "^(watchdog|timer)@[0-9a-f]+$" + compatible: oneOf: - items: @@ -48,6 +51,20 @@ properties: clocks: maxItems: 1 + clock-names: + items: + - const: sleep + + clock-frequency: + description: + The frequency of the general purpose timer in Hz. + + cpu-offset: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Per-CPU offset used when the timer is accessed without the CPU remapping + facilities. The offset is cpu-offset + (0x10000 * cpu-nr). + interrupts: minItems: 1 maxItems: 5 @@ -67,12 +84,27 @@ allOf: const: qcom,kpss-wdt then: properties: + clock-frequency: false + cpu-offset: false interrupts: minItems: 1 items: - description: Bark - description: Bite + else: + properties: + interrupts: + minItems: 3 + items: + - description: Debug + - description: First general purpose timer + - description: Second general purpose timer + - description: First watchdog + - description: Second watchdog + required: + - clock-frequency + unevaluatedProperties: false examples: @@ -86,3 +118,20 @@ examples: interrupts = ; timeout-sec = <10>; }; + + - | + #include + + watchdog@200a000 { + compatible = "qcom,kpss-wdt-ipq8064", "qcom,kpss-timer", "qcom,msm-timer"; + interrupts = , + , + , + , + ; + reg = <0x0200a000 0x100>; + clock-frequency = <25000000>; + clocks = <&sleep_clk>; + clock-names = "sleep"; + cpu-offset = <0x80000>; + }; 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: 13100455 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 E7912C677F1 for ; Fri, 13 Jan 2023 10:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241253AbjAMKei (ORCPT ); Fri, 13 Jan 2023 05:34:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241050AbjAMKeZ (ORCPT ); Fri, 13 Jan 2023 05:34:25 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F163D3E87E for ; Fri, 13 Jan 2023 02:34:04 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id u9so51353125ejo.0 for ; Fri, 13 Jan 2023 02:34:04 -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=HYzS5lJrlNePm+EqSa1A5bO0nJ8HrOYWqYhvABcLfJ9XkCz7ID7l5+QKkf1bG3pSJb 2odcb6JEydYl/0TJTmh7SqoAYMl6FN1jniGJY5LcwLQy//hcENB4ZTdm/qrDxGSOIuzM nWnzCD1bgnWAVh93bUFP1d0ge1jDV0x7J5L1+0CJEIkIgrHJkmjigxh4lBM+0ArDtGSu 2S6k4Muk88s0jFUkwKT3Q0KkySIXBLtyQzAVjOaQyOjbrTokCU5BaqNU5UzstObA9q89 UHJx6eBHebMGZIoynsVy/0IlpmpNEWC2EsaOlyErQ27PyqDKKtV9npaHdRNgJ7CFwas4 lAjA== X-Gm-Message-State: AFqh2kq9vJJ94P1F6HTZFpHGyU1IqNFSYZVPHhkBr0a2EAXKBV8vnEgR NlVRVuAdSJFuYI8wj1iKsOCQvQ== X-Google-Smtp-Source: AMrXdXtlbTT01BZOGgQNxInpR+kMgGqUmp1c1+Qqf27/VwCuxJGq4TZAVftXeQYimyAj62MLG7egZg== 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 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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: