From patchwork Mon Dec 12 16:35:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633873 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 53BACC4332F for ; Mon, 12 Dec 2022 16:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232016AbiLLQfn (ORCPT ); Mon, 12 Dec 2022 11:35:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbiLLQfl (ORCPT ); Mon, 12 Dec 2022 11:35:41 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C63F4B6A for ; Mon, 12 Dec 2022 08:35:38 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id cf42so349004lfb.1 for ; Mon, 12 Dec 2022 08:35:38 -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=Ai7DRTu5Ju7JecvhYYJbDduggLKq/Lu2jurxO6GnUFo=; b=zuHTLfNgNkL/2WjnKIW6VFbXHeTdI3po8GZXAGyluCsuBn8wc6GpZWDjsLWeCR7IgP GiaskF05b2d5f1vVUdckQf+Hf/5ioH31m79t/P3jgaR8vONwqForTqvKpArM1xIP5hkI V5zQIg0InlwTTSkuzFVX+Cb3t0brxupL1qrDicJL5yLYZbRNRhZl35RLW7A99yQVcRiw K2esMbruw5sD5Bz5QCltb+k74TOArbIEL+vbvkg44DCdbQJK2AqZnq2x9Vh2CeM8R0ZV Rufww3h0LdPbSa13xdQilEoWdG5pQXR/Rto++7GFW859jUwUKoxspkQ1s0m7a7I2CJnr DDkw== 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=Ai7DRTu5Ju7JecvhYYJbDduggLKq/Lu2jurxO6GnUFo=; b=U+tvhWodcW+Mi7or+Y4aIzwpnLunekcbI1Lm4Gxdnco30Dj9Miy0/7vxCubLYP7v2i 1VOn5Jd2bUdd7bQt4X/ypRrINR1dR3cnazGRF3fgbhCXHSaVjm78HZWzU0VKs3aNYVyK P5Z+tNl/aQck3+ENR+aDZPG5rD6p5s5GWuxISixPc6zAJurSzUtMQIDif8l57/FUKl59 37ENkL2mzOkW/VD4+GlD7QDItzNZ39P0kiyHKN234FtT+8HsLjeOeGvktg4sftUtDamk umYR8ZcZekP2TpEsV3D6tA4o13u56fEdYFbtMN+cWte4vdCIzX3XaEMzgoJRRDB3FEAL +WtA== X-Gm-Message-State: ANoB5pkRIB0RkuO8LAYdr4+HOTlI+SmFnihRmUkVOScbIITDZHyhZoMB vQwD6C99Vs6rD3Z+RQa/4iBAyQ== X-Google-Smtp-Source: AA0mqf5uJxoaapU1bf9LXRq5Fh8Reo57NvF4j+JDtO4HpTstx2QxBTh+ICLXxlu0Dej51ORVBguwSw== X-Received: by 2002:ac2:5594:0:b0:4a4:68b7:f889 with SMTP id v20-20020ac25594000000b004a468b7f889mr6767309lfg.45.1670862937080; Mon, 12 Dec 2022 08:35:37 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:36 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Prakash Ranjan Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/12] dt-bindings: watchdog: qcom-wdt: require fallback for IPQ4019 Date: Mon, 12 Dec 2022 17:35:21 +0100 Message-Id: <20221212163532.142533-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 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 --- 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 Mon Dec 12 16:35:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633493 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 7CCDEC10F1D for ; Mon, 12 Dec 2022 16:35:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232056AbiLLQfx (ORCPT ); Mon, 12 Dec 2022 11:35:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232194AbiLLQfs (ORCPT ); Mon, 12 Dec 2022 11:35:48 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47E67BC11 for ; Mon, 12 Dec 2022 08:35:46 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id p36so270446lfa.12 for ; Mon, 12 Dec 2022 08:35:46 -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=h4Qp2j2FvyF4l/C9cf93kEmmbnhWdpKxZ7O93BScdO0=; b=BZ/MRDpTZyHahdJHX0LVHOvolkQQWaaSaWzNJthVkFgQ4+FJgComqCsXbbLcy1tljE XgxMukoAMNin7jVQt8FiylDRQgyHywOVmZzzN2O/qpwhNpu2/9zOeS9okJKWRBvLD/kw IOnfq1XdEEAr9tQ9T9j6WQ/k1dxCU2QzV1eccA/828dDmnhf8adzWAJ50+DDUHieNnn2 gm2/sFCG/hMFxFt3LxzcZjQANmYhnXLda1FPCeF0HPAhz2JF/5VzU3h/RihqPb24vHka rwo6xbUx/nnPQ0ibRlvg6h3PR11+RryKZyN2NUsfyFdtPOZz1P9fvLq3l2IQbr+rDsxP +prQ== 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=h4Qp2j2FvyF4l/C9cf93kEmmbnhWdpKxZ7O93BScdO0=; b=vvW3nTx506yivKL1pSjl8Dg7hm+bQZMgzEHTNyA8mOXk4dXbh6tYQtEROVDVxnsBhg pCyxUvHQiQOvoCdgNwdLxr/6d0xcwASuRE+9Lw4Xl3KETTRr3Q8G8w/CooVzSRqvasQO QBPwFxCBSjbL23ZYh6O4U7BnDkuXhFzyvjYlYuY7xfvblXdBlbS9wHhXyH7reM+UJz3p yJEgOQkquIFus8vvXH7WMPEict6yXH9pKjSqkpPeZ9QC26dTlYUBexNGG/BXcf30qUek brqvzePQKdfez2ps7qqrwIwqffOkOCTLl1Wd2MG5PPMavwi9dRzt5c780R0MgU+qvcLj T2wQ== X-Gm-Message-State: ANoB5pk1/lRQdNScEX6jskUK+IKxpi6EZZPHXnPUEPw7zJEJ3Tdv0xk8 Ic71IVMxYTnJfjxla11i5BRj67sYhGeLkrCL/mA= X-Google-Smtp-Source: AA0mqf6fPunqgfDWC+m/U0oyL/I01xQegsw1STuWR+amZ/xep2rr9um0cUib/I2PjfLCXo0BvLwr0w== X-Received: by 2002:a05:6512:224a:b0:4a4:68b9:19fc with SMTP id i10-20020a056512224a00b004a468b919fcmr6685294lfu.36.1670862938382; Mon, 12 Dec 2022 08:35:38 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:38 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Prakash Ranjan Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] dt-bindings: watchdog: qcom-wdt: do not allow fallback alone Date: Mon, 12 Dec 2022 17:35:22 +0100 Message-Id: <20221212163532.142533-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212163532.142533-1-krzysztof.kozlowski@linaro.org> References: <20221212163532.142533-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 --- 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 Mon Dec 12 16:35:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633872 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 50099C10F31 for ; Mon, 12 Dec 2022 16:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232194AbiLLQfy (ORCPT ); Mon, 12 Dec 2022 11:35:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232446AbiLLQfu (ORCPT ); Mon, 12 Dec 2022 11:35:50 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49EB5BC1F for ; Mon, 12 Dec 2022 08:35:46 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id p36so270561lfa.12 for ; Mon, 12 Dec 2022 08:35:46 -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=30srUlHmhvQinDZRA9pL483REIcldChcDPXez08Oy6s=; b=E2nfHZA0p+2VNGqauJAYaxYL4pmJ3SXRjpKX/nRAolMGfmQ5fG9It1B7GDwF7+/gM2 8GKDIysTwDCiPlJdYeGFDC1SqXlSNwfhPfacMEBFaKUM614RsjerSyEhgwDs+0INeMDP vVISLZqd1mvKVVgnFyxq/tOUNK9ih9XY/6rERT524W7trAeLON9z8F5N11/B4pwKjrlz uuj5+SEoQ8kdDG1mNPszDU3fd1Otp2TICvQceAzR1g+Tp37/RgamPz0zdyi1rU1RdyXO 2l6Kazgof5pk5zTI9qKmjn2YZVfug70X1WQxmOtLfXl60pgf5Yc8LfUxvuufazazWERs QRXA== 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=30srUlHmhvQinDZRA9pL483REIcldChcDPXez08Oy6s=; b=3fMarnRVxP/vGi/s4eQ5Dhe1HE7liuzln/GyvzO25w4xrH+pZpOI07RIm3O12R+F9a Ck8y5JSYquS7Ag76VJGwSeuVSeciaRynzB4NAX6wrjzX2fL/joaRB5Nng9oe2w42tbFW vCvFwEjgoiC5UdptgRjKk3fXDPUreZTNHaGunDeHfQ1wwX8uyBySaSAvE1gbQEYn5IMB HQZW+184/q1WBNDNU03KDyggGxllBJiBXIT5gucq4T9NWA6PmXd67x2kPQIfXUtUiYB0 Uk+LYBlLiadNDWQVLoekwFyf7d6UgEaSWG/7N4DPuC0Go5FtPbfwxKdpj+q2s99FKqkX t9jA== X-Gm-Message-State: ANoB5pndD2hXfpmxP/yN8OT9Lr8RNJYM1SdyOBeQe5yem6mlM3eN/8kg WbTW5+3gdg5FHOweTVwW8CpGHQ== X-Google-Smtp-Source: AA0mqf6gmS1/I5so6sE4ZfleyxNiIyI4maHqbGV1XPNzJSOZSbIkWXW/HKcnoLXhQebDt6HyKUWnfQ== X-Received: by 2002:a05:6512:3452:b0:4b5:83ba:11ad with SMTP id j18-20020a056512345200b004b583ba11admr4092764lfr.35.1670862939703; Mon, 12 Dec 2022 08:35:39 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:39 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Prakash Ranjan Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/12] dt-bindings: watchdog: qcom-wdt: fix list of MSM timer compatibles Date: Mon, 12 Dec 2022 17:35:23 +0100 Message-Id: <20221212163532.142533-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212163532.142533-1-krzysztof.kozlowski@linaro.org> References: <20221212163532.142533-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 --- .../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 Mon Dec 12 16:35:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633492 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 AE084C4332F for ; Mon, 12 Dec 2022 16:35:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232693AbiLLQf4 (ORCPT ); Mon, 12 Dec 2022 11:35:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232516AbiLLQfv (ORCPT ); Mon, 12 Dec 2022 11:35:51 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 855BAFCD6 for ; Mon, 12 Dec 2022 08:35:46 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id bp15so265880lfb.13 for ; Mon, 12 Dec 2022 08:35:46 -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=MrlXoiGbA/2CszX40DeD+tawQUe1JnBh5V1LSFMpA5I=; b=rer1g8GORdvmzqTiedHoBbXnxcQ2UNzJeXv2VXp7om9lUZzin06+eTqRtdHT13tBrK bOsYNmgzb/P06emo71WjpXinOxZyL7uOngh15mbJjUjSOtys0yQmNcd2UNwnhhuuZZij vALMoh44/cA3nzTtxcRE8eCUIlUv9PUHPmZd+h1V7ggQKS9oySwnMUtafUU5UKm3CDC/ HQlf8IZ3VgxbEDJQkID8UHghIb2YRAo9lpZBwKT2UAIOJsGImLRetUP82Vdw7lXQ6MdB siwHNphVC/3+LazQFPdLxJn8S7QInTlFoPCUYyB+Ku7rL7962gsRE0nPeFscGtQ03WR8 U2Dw== 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=MrlXoiGbA/2CszX40DeD+tawQUe1JnBh5V1LSFMpA5I=; b=rDmLyPpyDqSInG53vceC/+l7rzTOn4JrlZAckK5KTwEG1isSP+iv5+HQ/LpMuTN15u vRo96mLS2cserA6gHkx4SE0QY5EbTpU27bNqj95eHgsQNbf/Nba0VM8XEbvnvx0HsbW4 HPswdsEGUs2fpxcP1UMG1CXJsVGO7nZ1KjmHJgcgHenbm3/1M4UbVCRkHLWo7tqsF3HJ wlbkx2CJtX0xyAnLRcVttgF+kBig0aVstFYL44JDs8jBX4Ku5TMgbaRiEZJAAOSImHYP K2bKhLfCJYSSx1J9+LbJAlhbGnL0NBvzFlVa60C25nj/9fdNyo5lWrwl8xSzHLz+hakF MWwA== X-Gm-Message-State: ANoB5pmd7TO3QEQq69/dyt2Ga+9iVH8kem6xkeTpLHf00Kl+TnNiHMuD zke3ueykmRbrpxj829ImJCPQvw== X-Google-Smtp-Source: AA0mqf4lEiGXY/G8VPd3QBRf0uJu0eKFDZFX8MfnlMleY/jamRaoZbjZon/FxlAbdhCsTU2WEhbadQ== X-Received: by 2002:ac2:569e:0:b0:4b5:9e59:8ce0 with SMTP id 30-20020ac2569e000000b004b59e598ce0mr3141109lfr.40.1670862940945; Mon, 12 Dec 2022 08:35:40 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:40 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Prakash Ranjan Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] dt-bindings: watchdog: qcom-wdt: add qcom,kpss-wdt-mdm9615 Date: Mon, 12 Dec 2022 17:35:24 +0100 Message-Id: <20221212163532.142533-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212163532.142533-1-krzysztof.kozlowski@linaro.org> References: <20221212163532.142533-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 --- 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 Mon Dec 12 16:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633871 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 94483C25B04 for ; Mon, 12 Dec 2022 16:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232244AbiLLQfy (ORCPT ); Mon, 12 Dec 2022 11:35:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231971AbiLLQfu (ORCPT ); Mon, 12 Dec 2022 11:35:50 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81A15DF1C for ; Mon, 12 Dec 2022 08:35:46 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id p36so270770lfa.12 for ; Mon, 12 Dec 2022 08:35:46 -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=5MhRmIwqiimhM0hU/ny7BJCiWCN3HyB8MyrfD6CbYtU=; b=uy4HgYN0uRqGM8cMy+QL9myXVpoeWEZwaz+wMUd35PefJkG61oUwRDGQ5dQ1NN0HGN iZihOU2+Udx63EJFwskcjgxYeYc3GYm8St6tuYPwQt4oi3fERQMpyD+DZ+1mKOiZLceu i/FfCOh3gdA2PNG3+NKtB409cv+QK1M0rSoOdI2zLVs1Xfs7OfOUrAuJhkLj0osEPBic 4kytn0LBtPg750TmgeTEsSi5eFrT/r9iFvIMYMF6lH8RG5QJuiyNHTtaGLHBPwH8MOOP n2gibzRWaN+qj0uhfKG4szZ5pQNIWl6/auFMAvXD89+XB/6JRv1AN4lPdTcg4x+obRCd 8vRA== 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=5MhRmIwqiimhM0hU/ny7BJCiWCN3HyB8MyrfD6CbYtU=; b=tyErozsyYhA29ue9lcA1eFL8jTS/ec2hLFxltI4gt+L0Q5IaI+OYmV0dP0F7+9lUcA mnV0ORfgs6cI78p0XpZ7uTJbvYEkBz0UBDwTQg0GoK/4ujHzL2n5OcNuy+FsBhHvgNNe EQNDCn9dG9E2OCj0jGw/7V8mgSGz+zp4eV80UUOIJUCNFjLfiCU3ld67eMePxwG1crPM HnngTVXPgnGFpjkjEW8xve7gD32vlvTP88I1AkO8YPD9KE6IhonGfkfW1UZaTygS7DzO pH6NM3+AFOga/FyZjoCOFyEOdW4fLGDVK3cRKPYvCNWBM52/PycWtg3KgnT5t4wgcjXs s+VA== X-Gm-Message-State: ANoB5pmTL/Q60SbqxH28mrkis7cnb/a6y5GWPsHgc4tZhuaE/Q5SF7ga KB6GvNrRHyRvtWbWiXCbjYL+Wg== X-Google-Smtp-Source: AA0mqf7xUv2jmQK3i5+5KlYg9i8KU8zB46JPYfemztw+j90RVuRAt4Lnfx4YeNvqPJHInSSAQf40iA== X-Received: by 2002:a19:5513:0:b0:4b5:5ddc:da32 with SMTP id n19-20020a195513000000b004b55ddcda32mr3873335lfe.56.1670862942224; Mon, 12 Dec 2022 08:35:42 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:41 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Prakash Ranjan Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/12] dt-bindings: watchdog: qcom-wdt: allow interrupts Date: Mon, 12 Dec 2022 17:35:25 +0100 Message-Id: <20221212163532.142533-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212163532.142533-1-krzysztof.kozlowski@linaro.org> References: <20221212163532.142533-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: Guenter Roeck --- .../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 Mon Dec 12 16:35:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 633494 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 2C9FFC00145 for ; Mon, 12 Dec 2022 16:35:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232339AbiLLQfr (ORCPT ); Mon, 12 Dec 2022 11:35:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232194AbiLLQfp (ORCPT ); Mon, 12 Dec 2022 11:35:45 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7468DB6A for ; Mon, 12 Dec 2022 08:35:44 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id y25so292060lfa.9 for ; Mon, 12 Dec 2022 08:35:44 -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=Z5YdFqvc4mvoUpjnEdg6UwW9ItZt44+OzF74arwCzxM=; b=ta3FbO7eAitz9phNwFQsTIDDNTTY7yhEWS8RRtjq2+yKHaocAr3LuCL5Ab5XaLVwcL NVB+CTo76h+Dxkd9gqxLtuHpDGHO9UiggO+i7WAKyNLP4UfYCJrO4GaGnLfyyMNH/Acf KHXZ41jSMnPI2K8Qnc3TJ9HEEz175tu3FYPWq3/uC9knaS3VGzhCwhPenHWbuEQvnY/D 4eM6ZCNlCiyMBafAS/6Juj1ny23kRutmdgztSLI9HzmEBLESIUQ5CJdNqDUPpsPpe4Xl 83SZwjs039OX1oAGe+KUM/6iH++7ml/M1+VvXnQqsF6vDTF2uRwjHTCgr0zvysRhyNv4 +BZQ== 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=Z5YdFqvc4mvoUpjnEdg6UwW9ItZt44+OzF74arwCzxM=; b=NAekyfNRDMWr9I9tNyMrSJIKsfn+TGwKRlijLuNNqGfWsPBkOPbwG1FUJ+Wql3Imqg UnpIl01GC4TXMYYY+brZ0idSP+RczS0JDZyPSmmjEVhWOM2Z0VpuSbGJinbtPEtTsXGv ltcqXHvUTsLqjrLmJIyp+97R+4c9EE5MgwIvoulmOHy2fXqaKvTtQWNfqXoYzH9oc/An zmWMUZypxYF5aq72Jcf788J3V7s6af9ryq2A1BgwHFlGtkSnQddzFO4aoG2zAiMw3jYN jqnCR0AHHxphyutKMrbKJM4dZzxSGMzURrdqHiYX07bGhcHBJ7/Y7Rx4TR8qSViitOdd YBgQ== X-Gm-Message-State: ANoB5plkG/IW9lYoFUTsBydOR80NiItks5UcOaZtUcdiLDj3PWdv2/VU vNbUcYjggbAR+CegWWgJahWkZg== X-Google-Smtp-Source: AA0mqf44jIvXTV5CtEU//Sp9GXDTVSUtJPBn0HWN1nqPi0vsJZ/SOQX+p/GnzP9eHMnZmqPFBrDvtw== X-Received: by 2002:a19:a41a:0:b0:4b5:8fee:1d71 with SMTP id q26-20020a19a41a000000b004b58fee1d71mr3660656lfc.64.1670862944027; Mon, 12 Dec 2022 08:35:44 -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 v16-20020ac25b10000000b004acff58a951sm29209lfn.133.2022.12.12.08.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 08:35:43 -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 Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH 06/12] dt-bindings: watchdog: qcom-wdt: merge MSM timer Date: Mon, 12 Dec 2022 17:35:26 +0100 Message-Id: <20221212163532.142533-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212163532.142533-1-krzysztof.kozlowski@linaro.org> References: <20221212163532.142533-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 --- .../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..697caf1937cc 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 in that order. + + 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>; + };