From patchwork Wed Aug 17 13:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945877 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 B4F8DC28B2B for ; Wed, 17 Aug 2022 13:14:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236941AbiHQNOf (ORCPT ); Wed, 17 Aug 2022 09:14:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239403AbiHQNO1 (ORCPT ); Wed, 17 Aug 2022 09:14:27 -0400 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 1F41F4BA79 for ; Wed, 17 Aug 2022 06:14:24 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id v2so18957347lfi.6 for ; Wed, 17 Aug 2022 06:14:24 -0700 (PDT) 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; bh=ylRikkO/bjiVr6cfpMQukwsajH9gmB7MCgQxpA3FZjg=; b=PlW7Mtcl47MpdE/4X+zlMXjbRlUXpGWW9lYJlFzAkyhQ6HaAUQuNhxHKHBZATug0fV qWWX0jOXCVp+nAnrGjjF7KUBOemnJGrR02np5S78KK79cjImAtHquy9edBoPFqJ1zp5T sxPsNlena2Y/2n9nF2P6+V51h8teL+21UMhJNmrqGofHl8pDvNYByk7pnsQSIaPyKLr4 2LzUPkeLxCO/3TpJnod9YLGzhENtwtomzyI4wdvNDWiqh7rDVci2w1728KL/JHXN9d0k OOV1Hd63+mI08bZZDt1S+FdV6Dtz68N3ZL/czhDm4NXBFmrPYnbwWb0K5GgrPluFd5hl JFpw== 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; bh=ylRikkO/bjiVr6cfpMQukwsajH9gmB7MCgQxpA3FZjg=; b=ARldG9ISieyaEjXTihRCVNKuOa8TRrV5pnTFekI8zvZ1h0DxXyRqrpGMOLQ8SM30Zs 8gNcLvlbrFiDqHkwRuHYBdMmgOmZylpsxsQpmWePgzOjWrB03tZbUQEOCsAbe2S9xEjY 0udEDMxdlwbD4ZxnjmNRrI/mQFeH2RNJ/vb6LC19N5cuhWvUANA+mh+rdYTwAfjX3QNQ 7pm4udo1BGj8m+fznpWxMDAzM6BztHRUdDy6VpqgQYIF41wwQ18skp1O8iwATrVXU4Ly VFDNxYvax9jEJEYD31NHQjVthN2o3dEqRxqf/3iyGPEJC8vY40p5a0Qw+qaECIfOiOIl TGxA== X-Gm-Message-State: ACgBeo25SH2XM99q5my/4et7ZONBVppJYOYtn/wzTsoHtoDuac/W2a0+ Q/9YPNaBYKoILUIBBYkxs1pVJyHc7vNekq0e X-Google-Smtp-Source: AA6agR7hK/LtVDTNcW/FOB3ZBLh9ErM5S9vA8oOiKLvSKbz5Ptv+gx5OFqdfNPZpxNBEgxnzgv8Lag== X-Received: by 2002:a05:6512:4c7:b0:48b:29bb:8195 with SMTP id w7-20020a05651204c700b0048b29bb8195mr8347371lfq.386.1660742062364; Wed, 17 Aug 2022 06:14:22 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:21 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 01/12] dt-bindings: hwlock: qcom-hwspinlock: add support for MMIO on older SoCs Date: Wed, 17 Aug 2022 16:14:04 +0300 Message-Id: <20220817131415.714340-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Older Qualcomm SoCs have TCSR mutex registers with 0x80 stride, instead of 0x1000. Add dedicated compatibles for such case. Unfortunately the binding started using a generic "qcom,tcsr-mutex" compatible without specifying the SoC part, thus it looks now quite inconsistent. Signed-off-by: Krzysztof Kozlowski --- If anyone ever says "I want a generic compatible because I am sure all devices are compatible", that's one more argument they are wrong. :) --- .../bindings/hwlock/qcom-hwspinlock.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml b/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml index 1c7149f7d171..de98b961fb38 100644 --- a/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml +++ b/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml @@ -15,9 +15,18 @@ description: properties: compatible: - enum: - - qcom,sfpb-mutex - - qcom,tcsr-mutex + oneOf: + - enum: + - qcom,sfpb-mutex + - qcom,tcsr-mutex + - items: + - enum: + - qcom,apq8084-tcsr-mutex + - qcom,ipq6018-tcsr-mutex + - qcom,msm8226-tcsr-mutex + - qcom,msm8974-tcsr-mutex + - qcom,msm8994-tcsr-mutex + - const: qcom,tcsr-mutex reg: maxItems: 1 From patchwork Wed Aug 17 13:14:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945878 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 AED48C32772 for ; Wed, 17 Aug 2022 13:14:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239784AbiHQNOk (ORCPT ); Wed, 17 Aug 2022 09:14:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239685AbiHQNOa (ORCPT ); Wed, 17 Aug 2022 09:14:30 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E4F4BD1B for ; Wed, 17 Aug 2022 06:14:25 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id w15so13542236ljw.1 for ; Wed, 17 Aug 2022 06:14:25 -0700 (PDT) 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; bh=CEQ6kD7E3x3cGbQZ0xWqW+Ktcext0aENc2Q7rleIIpo=; b=ZLW1S4NiQU/zIX4dyxR1JbzzCb9w3pYh1ElEDkry2G49gQQwdoV4ZbBEqfMgLxvwk3 qn+U7LlGYMMHtOuupRnX8wo5BaXQZ/2ZwVjnVyzLnIEYucldFUClvsxpWRN+iETeLROc 3cDiMgCF/bt9aMWhEKVS/XdpDnVf3PlchWidgj0aheh6UxqdZNGDEthcLtIMhjOy+kIR e7b7pEC56l7+71GHun2fdcULFqQ1kKpR6UTQP+eE1SPSEp+UjB0ZTuCl8BMBLmHkGfIB B3kS5jZR+NQJvCcCVOQ1NLmZagOGE+A7fVI2sHna6YocLY8uTFyo+GSzeX70G6nxCuNx 2ZJQ== 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; bh=CEQ6kD7E3x3cGbQZ0xWqW+Ktcext0aENc2Q7rleIIpo=; b=kHyhGma+N3La38zHFiDMe0pHhbws70KaRJPCMzKrMS18yJa7qv8C2WQLPSb12aS/DA EGClJQD8Om8qU0TubyKzXR0vKcDvLO5yaxLp95rIcxPzGEpXilTY/ohjwlGBwGdaqLlU vPGtY3Ox60Eg9czCA6KQTzsksrDsoSuOTu1dT+/34y/Ai14EdhWef1QGZLmhMU4Imgp0 A6+WHZ6JQE9QkksRJ9agKFH2ovrTnutUq9R5mrRJcrT6L+OC5nhBBWRbXz8GgDqQMov6 eRUvyuMyX6qAuar5IDMrLwarHtdaOAT/qPxzQyfOAefD5qQfRrg2snzkrR0KI44t+45g GO5g== X-Gm-Message-State: ACgBeo1kV8zU280AXBNCV0ZwfzOwNcyb//YeujQQcscM0yrD2kFPHdqE of7AN71IuTWmZNH93cbNI2POIw== X-Google-Smtp-Source: AA6agR7KrrzN7b/lcEy++KQc/DJ9TjbfJCRkrrA6FmPSFUqMwZ0dAq5BtJWI5XRcsnwJW3AfxaUL6g== X-Received: by 2002:a05:651c:14e:b0:25f:dbf7:8636 with SMTP id c14-20020a05651c014e00b0025fdbf78636mr8007233ljd.51.1660742063840; Wed, 17 Aug 2022 06:14:23 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:23 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 02/12] dt-bindings: hwlock: qcom-hwspinlock: correct example indentation Date: Wed, 17 Aug 2022 16:14:05 +0300 Message-Id: <20220817131415.714340-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Use some consistent indentation (4-space) for DTS example. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/hwlock/qcom-hwspinlock.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml b/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml index de98b961fb38..1a3adf75934b 100644 --- a/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml +++ b/Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml @@ -43,9 +43,9 @@ additionalProperties: false examples: - | - tcsr_mutex: hwlock@1f40000 { - compatible = "qcom,tcsr-mutex"; - reg = <0x01f40000 0x40000>; - #hwlock-cells = <1>; - }; + hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; + reg = <0x01f40000 0x40000>; + #hwlock-cells = <1>; + }; ... From patchwork Wed Aug 17 13:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945879 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 DB94CC32774 for ; Wed, 17 Aug 2022 13:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239794AbiHQNOl (ORCPT ); Wed, 17 Aug 2022 09:14:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239748AbiHQNOg (ORCPT ); Wed, 17 Aug 2022 09:14:36 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DEE625E88 for ; Wed, 17 Aug 2022 06:14:27 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id l21so13535838ljj.2 for ; Wed, 17 Aug 2022 06:14:27 -0700 (PDT) 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; bh=Yg02g9RCBzELEXyS88kfi01jTvYemBxzwaKsyEKanCE=; b=wrxaq7kIOpkPNFTiLpjulwCD7pviXkUQGvHL9K/EVHN5XsO7SN2JLubqS+u9PCcp5v q0vOZVwTtxD1x5mYS+/y7aa68SIKuzE8DZuOm4+sRD0zzLTLLwk488pBr5EicLQAly/1 jQWEu7D26Z+pT4ShEDmBxsziUSiTd288fmynPp/5uP9gitFdW75iasYactInEaasMu40 Nta7yv0NpCMRYB/Mn7lcN2dyUvFyfiPl3H6JMjDbs1ffzgvgDB3K0WXit+xgqIowB3vc QWrwxpvvsgXv9CiWC1iIiMdTEq0DnmfAI4Lee40+6ZyUzN/V8OJ92T9vc5cpgGVP/H+i kYhg== 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; bh=Yg02g9RCBzELEXyS88kfi01jTvYemBxzwaKsyEKanCE=; b=vydcsxoTUGqMQ1V8e3Ybf/6lSlvuQEsjfGlxc22uOFzfG1aIfBKMcd22Z2u6yxz3sc yHpeIokEB0ZxtEfhB7iATpCu0kWJmePAIydiq4oE3XC1Loj343dns7EMERJRoDS0QHRS kdjg3ZL5A7VuU4oePiNsD0EzUNQ0j7bAu66XfMjyL7DimspxbU7HXGRvMaDLfjQllTbE UJi39lSQSqZJUMyXyPkiVeRWCLhQteXpjX4WP25TBO7Umi620lsmg43xriKEWAMhsZeT 0RmuHHLCQzZJjzSax+szqvKmFP8snSdXhEn3PNT0j9f6qfJeqHaDhMtR2k13uBV5uQaj WF+g== X-Gm-Message-State: ACgBeo0IbELfzIFnKvGXPiz3s4wpBZynvjmczkIqZepJ3skTjhYuJI0L BxA9qPR5QBDLi0TKfQS4XxrzOQ== X-Google-Smtp-Source: AA6agR5uzwpyakQr42iVyz1uBf4J8T2NX3T081uUgaSAx0+liX43Wz9QFyk9NN8TtSGeujw5eecP3A== X-Received: by 2002:a05:651c:555:b0:25f:f134:de3a with SMTP id q21-20020a05651c055500b0025ff134de3amr8354626ljp.376.1660742065551; Wed, 17 Aug 2022 06:14:25 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:25 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 03/12] dt-bindings: mfd: qcom,tcsr: add MSM8974 Date: Wed, 17 Aug 2022 16:14:06 +0300 Message-Id: <20220817131415.714340-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Document new MSM8974 TCSR compatible. Signed-off-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml index e1c4936a0352..e7383dcad83b 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml @@ -18,6 +18,7 @@ properties: oneOf: - items: - enum: + - qcom,msm8974-tcsr - qcom,msm8998-tcsr - qcom,sc7180-tcsr - qcom,sc7280-tcsr From patchwork Wed Aug 17 13:14:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945882 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 AA5F7C25B08 for ; Wed, 17 Aug 2022 13:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237021AbiHQNOv (ORCPT ); Wed, 17 Aug 2022 09:14:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239774AbiHQNOj (ORCPT ); Wed, 17 Aug 2022 09:14:39 -0400 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 500714CA0B for ; Wed, 17 Aug 2022 06:14:29 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id s7so356818lfp.8 for ; Wed, 17 Aug 2022 06:14:28 -0700 (PDT) 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; bh=G7nHz7460NiblDwkfaLZP3QC942cYsdIM8XAFA/ajO4=; b=Ux60q81hVODEZ/9jXK6w497/gC2vI3P1tZbdFxdC7xZz26+r69kF7Ay82VhNZborZk L/TqTpH907LPYU7oDzCO2WHPks/3Nt5X5SXUJt65mFu8kNFDwxa2RgNQENDyIenqsVji KO4CkIbSeSKX6cthFiFYToS+bSBV0y1bDXlXjNNZhsJRiAG35W3hnRUoprjD3PZyujeA /w0blmU9lUw5MSxHa/bbaVsvGmEwGq6tl6LuFQgr6OkeFyryD2WmIW+V5OaMkW0rnjGE vWHe0c/ZBQit5GGf5CKS04xciRk1+vWigIp5+kxAiPRRZJNyegN/DGfWEj23co0DWa7J igLw== 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; bh=G7nHz7460NiblDwkfaLZP3QC942cYsdIM8XAFA/ajO4=; b=R7JlAnntcCUgGI3TIwZrQhib9xPg+cBEwcpqmc2TZfvcyIllU3THE8P4DrN0AF7Eg/ pghgSObDk3JCbLY6omC3watLV5414mApSYsMvIGozmC8QKTGtfLdQnSHRlzDjgMfntpA PDl031iuUb3/t9vParm5PpDIf83WHeuzzw66RYdg2yWkzNtoJ2+MjfENXuLyczqbwXiB JtxgqpNVj5ZWs00/pmSI3NqPxrkFHTK+67QlMFdRdK5atC13qH2zFdZBEaUKODM0lxOO vBTL63Bv+l7K2zDbEpGZi6/O5hc8TNFzfEpoOR47urKAt81RjLmaz0QjIDT0m8DqTrOv lv7Q== X-Gm-Message-State: ACgBeo0Lef0pFBHram6E4Qy3UhfJlvY5reuydfGQUmq+FU1XspuGMPK+ EW1LNf60J53NAA50xNHoVCBKxQ== X-Google-Smtp-Source: AA6agR7VvZ0QXXkcR5lT43JZl+4AdD8B89Fw1v6q71SdS7UPGz75Z3tQMAGOjjFa6BZ9G5qRomKT6w== X-Received: by 2002:a05:6512:3e0f:b0:491:313d:5b6a with SMTP id i15-20020a0565123e0f00b00491313d5b6amr6822082lfv.223.1660742067199; Wed, 17 Aug 2022 06:14:27 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:26 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 04/12] hwspinlock: qcom: correct MMIO max register for newer SoCs Date: Wed, 17 Aug 2022 16:14:07 +0300 Message-Id: <20220817131415.714340-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Newer ARMv8 Qualcomm SoCs using 0x1000 register stride have maximum register 0x20000 (32 mutexes * 0x1000). Fixes: 7a1e6fb1c606 ("hwspinlock: qcom: Allow mmio usage in addition to syscon") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- drivers/hwspinlock/qcom_hwspinlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c index 80ea45b3a815..9734e149d981 100644 --- a/drivers/hwspinlock/qcom_hwspinlock.c +++ b/drivers/hwspinlock/qcom_hwspinlock.c @@ -121,7 +121,7 @@ static const struct regmap_config tcsr_mutex_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x40000, + .max_register = 0x20000, .fast_io = true, }; From patchwork Wed Aug 17 13:14:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945880 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 86C88C28B2B for ; Wed, 17 Aug 2022 13:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239815AbiHQNOt (ORCPT ); Wed, 17 Aug 2022 09:14:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236786AbiHQNOj (ORCPT ); Wed, 17 Aug 2022 09:14:39 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 787794D174 for ; Wed, 17 Aug 2022 06:14:30 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id x25so13525926ljm.5 for ; Wed, 17 Aug 2022 06:14:30 -0700 (PDT) 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; bh=NUd8YryzxRUKn1lcURqTFfrnvxH9vHeWn1VsvKW9iig=; b=j8crz0TGC0TwfsN5OrJTRjy9ExfL2boMNIiIoZ1GY8DY2Wi8+8b5X5/lv2gqmY7V6o aG0tfYcAOL6OX55fn2TtvZjNbo4cbB98QqLI6hmhHXa0sJFp+4Pd3hGETSYGKooGCm69 i+J0aZOHrU0Gm+Avl9S6OpiDSVZGKzhpbo2W8t4jSJjmP6wfesLIgEK84+vqfZ6B559+ X0gwLCno8PNjo0efY5DtGg0dRn0mtlx988H4zpYMPU3XV3OB7Z1rpjE0ToYiWrO8C3EF 6h4nSwl1PdoWkcuKcYIzDm8rBZdZhVBCMF1EautAoqjbAWO147MRzL1Mp8x0z6ZxSZik H8xQ== 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; bh=NUd8YryzxRUKn1lcURqTFfrnvxH9vHeWn1VsvKW9iig=; b=XU6SSin5u3DZoA87wAUZK+3V1PlZeItZrSkz4luLfq84BE1/eqmOPjejDZhayAGfdS RKJM2hRJTQTbG7kqZJSIrsmJECZ1erbbqHJZS+tYm7KW7l9ZW+t9N5aE6jytrUr+czMU 6x+LSKKfGdKh+o+n9HAle/p0Ap4jYOhu60U4cZ7fJnY0LjCe4ulx2rIOhoTbMUubEd1Y fczg8uIEI9sqCToEuNUVIAt6QL6B1L9X0D+6TOvJb86OsskC6wQVwO8/kzeHaAlDTBpt 53SJ1HgYkspXD/1k6oJyJUeFZVUkk4Tte+8eQe3z7inD1TeN6liLUfD5ZjSw58wI4fuF mSQg== X-Gm-Message-State: ACgBeo0zYWeJOJrITfAWsLgdF2Sl26igWGX1DJ57oA49+zKdcwslcXXu smX0PMXgPOD4lnlQpcYBllKpAQ== X-Google-Smtp-Source: AA6agR4ODr7SKicA1GAKwnAKK/adpoZpki8+XPbXTk8r1Ll36pXGE75J4H1rXOx4tDjMzSsB4QzPbA== X-Received: by 2002:a05:651c:154a:b0:25e:7b43:133f with SMTP id y10-20020a05651c154a00b0025e7b43133fmr8631623ljp.137.1660742068771; Wed, 17 Aug 2022 06:14:28 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:28 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 05/12] hwspinlock: qcom: add support for MMIO on older SoCs Date: Wed, 17 Aug 2022 16:14:08 +0300 Message-Id: <20220817131415.714340-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Older Qualcomm SoCs have TCSR mutex registers with 0x80 stride, instead of 0x1000. Add dedicated compatibles and regmap for such case. Signed-off-by: Krzysztof Kozlowski --- drivers/hwspinlock/qcom_hwspinlock.c | 42 +++++++++++++++++++++------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c index 9734e149d981..9cf186362ae2 100644 --- a/drivers/hwspinlock/qcom_hwspinlock.c +++ b/drivers/hwspinlock/qcom_hwspinlock.c @@ -22,6 +22,7 @@ struct qcom_hwspinlock_of_data { u32 offset; u32 stride; + const struct regmap_config *regmap_config; }; static int qcom_hwspinlock_trylock(struct hwspinlock *lock) @@ -73,15 +74,42 @@ static const struct qcom_hwspinlock_of_data of_sfpb_mutex = { .stride = 0x4, }; -/* All modern platform has offset 0 and stride of 4k */ +static const struct regmap_config tcsr_msm8226_mutex_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x1000, + .fast_io = true, +}; + +static const struct qcom_hwspinlock_of_data of_msm8226_tcsr_mutex = { + .offset = 0, + .stride = 0x80, + .regmap_config = &tcsr_msm8226_mutex_config, +}; + +static const struct regmap_config tcsr_mutex_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x20000, + .fast_io = true, +}; + static const struct qcom_hwspinlock_of_data of_tcsr_mutex = { .offset = 0, .stride = 0x1000, + .regmap_config = &tcsr_mutex_config, }; static const struct of_device_id qcom_hwspinlock_of_match[] = { { .compatible = "qcom,sfpb-mutex", .data = &of_sfpb_mutex }, { .compatible = "qcom,tcsr-mutex", .data = &of_tcsr_mutex }, + { .compatible = "qcom,apq8084-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, + { .compatible = "qcom,ipq6018-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, + { .compatible = "qcom,msm8226-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, + { .compatible = "qcom,msm8974-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, + { .compatible = "qcom,msm8994-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, { } }; MODULE_DEVICE_TABLE(of, qcom_hwspinlock_of_match); @@ -117,14 +145,6 @@ static struct regmap *qcom_hwspinlock_probe_syscon(struct platform_device *pdev, return regmap; } -static const struct regmap_config tcsr_mutex_config = { - .reg_bits = 32, - .reg_stride = 4, - .val_bits = 32, - .max_register = 0x20000, - .fast_io = true, -}; - static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev, u32 *offset, u32 *stride) { @@ -133,6 +153,8 @@ static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev, void __iomem *base; data = of_device_get_match_data(dev); + if (!data->regmap_config) + return ERR_PTR(-EINVAL); *offset = data->offset; *stride = data->stride; @@ -141,7 +163,7 @@ static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev, if (IS_ERR(base)) return ERR_CAST(base); - return devm_regmap_init_mmio(dev, base, &tcsr_mutex_config); + return devm_regmap_init_mmio(dev, base, data->regmap_config); } static int qcom_hwspinlock_probe(struct platform_device *pdev) From patchwork Wed Aug 17 13:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945883 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 BD186C32789 for ; Wed, 17 Aug 2022 13:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239681AbiHQNOx (ORCPT ); Wed, 17 Aug 2022 09:14:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239782AbiHQNOj (ORCPT ); Wed, 17 Aug 2022 09:14:39 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1EE44D81D for ; Wed, 17 Aug 2022 06:14:31 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id r17so18939508lfm.11 for ; Wed, 17 Aug 2022 06:14:31 -0700 (PDT) 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; bh=Ye4bqmRVQU/UtyZrgiLeA6KXU6bvQ0m892CxJrKhdQ4=; b=ed6cpMDb8WI+kpHuNPDw3tEHtLzGoeIM7/DhxZ8qY1spbgm2GgkLKM2vYL41UwjWTW Jr9TR0jKQQ5WmNC/Ebsaac+0rh0uwoGkYKo3oiCmJN6xlqoF2bO2Ltl+ci+4TMMgchCU FjSnDVVPFsVUXiiCcbt9tO1SmhcoEjt1SW0ez7B++yxaAZw7dskA50tLPmv+EVyh2vg7 MltuQedxRcmvs4pBtnEZ8xEHWm/RYJHmvWfyR+i2TopkLd8TfOeeCbZGXGYJh7wu+1Hs /1WVWpH11/l7UHlZ+uMA4g/d/7NfcdEaXD97rSId0OpsKfyf+3LM6T3bHvGt1t3I+lzk Whvg== 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; bh=Ye4bqmRVQU/UtyZrgiLeA6KXU6bvQ0m892CxJrKhdQ4=; b=oDJSXIpBCY4fUwFp8H3q+XR3Pi9rKkYdnmyPl+eXfabuPbSTQlRC/Kt0WLKavDyDSs ce6zQ2IueGzln3tIZmq2L00tHAUfZVorf+0GARBLF3FIfrasVx/9vbkvs4sjW92MMgEz 0GAn8ct/T+swFpPw5mNo09St6Qz65KpYklCVRBYSsjXJdprT1tcLbl9n4W2jVp1zGoOn Qb4q9PKgLZZ1dvErp+0yWgmM5OWbIxm+h3soxN4dZ7KqhBaQJPMhF1OHDiFiPXaLNomy 09v4PfypeSlI3XT+2yFAKpuaaJhePT1IEA1KpJnQ7xoX+0v7F8p+9KHKrhpFhwUadNDC z5rg== X-Gm-Message-State: ACgBeo047FKBy7iMv7IRAQMBZz9M/ZYHZg0cdMZbbGnsAEgKZ14eQMO2 qI5p9uF7VnZzDGpnEtgeuW3b9A== X-Google-Smtp-Source: AA6agR40LiTC3alpKQxZw8Z8Ahc4i1D+Q9jCLV9rHVJrjn5TH84JSJC2mmd4LlwEX2Gei2nrCKh5+Q== X-Received: by 2002:a05:6512:3047:b0:491:4104:cf93 with SMTP id b7-20020a056512304700b004914104cf93mr6591392lfb.546.1660742070296; Wed, 17 Aug 2022 06:14:30 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:29 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 06/12] arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO Date: Wed, 17 Aug 2022 16:14:09 +0300 Message-Id: <20220817131415.714340-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom/ipq6018-cp01-c1.dtb: hwlock: 'reg' is a required property qcom/ipq6018-cp01-c1.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index aaad7d9059f6..ae56fccebe21 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -129,12 +129,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x80>; - #hwlock-cells = <1>; - }; - pmuv8: pmu { compatible = "arm,cortex-a53-pmu"; interrupts = ; }; - tcsr_mutex_regs: syscon@1905000 { - compatible = "syscon"; - reg = <0x0 0x01905000 0x0 0x8000>; + tcsr_mutex: hwlock@1905000 { + compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex"; + reg = <0x0 0x01905000 0x0 0x1000>; + #hwlock-cells = <1>; }; tcsr: syscon@1937000 { From patchwork Wed Aug 17 13:14:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945881 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 78C77C32772 for ; Wed, 17 Aug 2022 13:14:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239776AbiHQNOt (ORCPT ); Wed, 17 Aug 2022 09:14:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239775AbiHQNOj (ORCPT ); Wed, 17 Aug 2022 09:14:39 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 370374DB14 for ; Wed, 17 Aug 2022 06:14:32 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id x9so13509749ljj.13 for ; Wed, 17 Aug 2022 06:14:32 -0700 (PDT) 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; bh=pqtLuKgHuRzFaU11WfzhWYMqklF7F2EiVQK9EioMBZA=; b=b1fRqbAJMcp7MUX2FEM9tYc3wbUwUDEQG6V91K9FJXB6NCYbi8D9eNXaJrQ6acEsTz 4FYHfDxLG1IWsEYf27Ra+q3ewylMGr6Xlt5s6AwP0ZZARxJx1qenfuOhtsEvPZIBfhLN JXf9eBsveGFDNDonbR6vec/7MYpWHTOl1UKTNt2VhfOYkmYa0INSFHB9UDbcjsbHepRQ 2Kh4eja2X9Ifz34Yf1mUydYTe5ohxUbtDHiLypPq6+uYugreCR2vA1Exbhin+QsWpAKc 9ddmxkO0Dga2GL8S+R/Zh2FGXM1M+K/W4GEi1n3f5ysqo4If32H3SIPosvL7T+nDU8TX YyTA== 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; bh=pqtLuKgHuRzFaU11WfzhWYMqklF7F2EiVQK9EioMBZA=; b=yyyUZaowPNVVxvMRhkCW1g6BrE98BErYGnvxvfpUQTA10xhek6PHzHRuREfzewdtif TqDEverHftgPwv7Xk7DI3UAMRTgjuabZr7QvTQCUJG3dAclkgEPlwlK5fEisMHXByC5S jIWWafT9ikFmOxfdNeZkLGbMByHiQlgmSKoBrlctZVJLg8DQT+EFegaKswNWpiKtqrYd N74R+pYeJchoLz4V6xbiBmocEAjIORMS+ZRWO8B4kpFAo0CrjFl5aR4PMIMfcxJs6EDQ WZbr84J/SIo411v+yd4rwAmHrQcZBqtm09hqsNlDJWmhTLzCeo6HoiRs2SGsXo74d2SZ v8AQ== X-Gm-Message-State: ACgBeo2RtvTTJiziuC9Tvhh4lWiMU4u1OXlkz6oimDLAqpUBvWYBp41P D+QJ45xdtZTqlpsfrLiKpGVWmQ== X-Google-Smtp-Source: AA6agR48PdRddyjQg7Y2vLx7jqebiR+4tCUBl5bItx/oMtFmrBED6xdwL9PgJoF15SElq6AQmcJWLw== X-Received: by 2002:a2e:9e56:0:b0:261:7544:d79d with SMTP id g22-20020a2e9e56000000b002617544d79dmr1742755ljk.296.1660742071792; Wed, 17 Aug 2022 06:14:31 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:31 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 07/12] arm64: dts: qcom: msm8994: switch TCSR mutex to MMIO Date: Wed, 17 Aug 2022 16:14:10 +0300 Message-Id: <20220817131415.714340-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom/msm8994-sony-xperia-kitakami-suzuran.dtb: hwlock: 'reg' is a required property qcom/msm8994-sony-xperia-kitakami-suzuran.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8994.dtsi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index 8bc6c070e306..6a9bca6c2c5f 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -164,12 +164,6 @@ memory@80000000 { reg = <0 0x80000000 0 0>; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x80>; - #hwlock-cells = <1>; - }; - pmu { compatible = "arm,cortex-a53-pmu"; interrupts = ; @@ -762,9 +756,10 @@ spmi_bus: spmi@fc4c0000 { #interrupt-cells = <4>; }; - tcsr_mutex_regs: syscon@fd484000 { - compatible = "syscon"; - reg = <0xfd484000 0x2000>; + tcsr_mutex: hwlock@fd484000 { + compatible = "qcom,msm8994-tcsr-mutex", "qcom,tcsr-mutex"; + reg = <0xfd484000 0x1000>; + #hwlock-cells = <1>; }; tlmm: pinctrl@fd510000 { From patchwork Wed Aug 17 13:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945884 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 86E91C28B2B for ; Wed, 17 Aug 2022 13:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236535AbiHQNOy (ORCPT ); Wed, 17 Aug 2022 09:14:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239744AbiHQNOk (ORCPT ); Wed, 17 Aug 2022 09:14:40 -0400 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 E9E1F4F64C for ; Wed, 17 Aug 2022 06:14:34 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id o2so18987613lfb.1 for ; Wed, 17 Aug 2022 06:14:34 -0700 (PDT) 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; bh=6hkmj/RZGZV2ubSm7Y6EYAIQdJcarVin5p0NjjE8aKM=; b=LuJ/DuHx4XaFQtsZbUlL5O+XQwKTuYuMk1wiqb2amgN7AammjIOHIC0tBnk4Wys2Ea PIFR30NaUfWwcbUKlW0Cn7JUiQILZXgSb7N4S0M5y3CYgFbmVj4IekoVv4rMmnPUp8++ VFOvVJV8pSa+Kf+lKGjc03HE62HpnYzTeAtq4Ukp4tfcgpqYBsV18zQSHSJ9vBbCov0z uxEM/UwcXaIYlLxJLzFXFZTC08y5t45MuJkCHEHxHzu/W07vV0jqz5S4Zo748TYDibyz HhjwhTQxCCw8Jry2oJUV3JALsJMo2em/tfd7Wf+qy+4kWqQe7czpjwF3Y3W2bbD8SgKM 3DTw== 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; bh=6hkmj/RZGZV2ubSm7Y6EYAIQdJcarVin5p0NjjE8aKM=; b=DMqoYuo4nbQVKT3topW+Gxlz95WKDRiG9+T//1P7ODT+rVNB5wLrNS0P176fhYw/vi tpmsYvJV42g1/JtQBu/f3a38TyUZzA2v/0vOup1MrBuTAvz4Fch6anGmac4xe3Kd8gYz ukcJ6/Be1EFIaHY9kPS1w9AhBYvWMlkaCRuAo8owZmFHG6vq/FG/EQMlSKH8oudoGI5k c7ZT4o3J0BhTFHxFxQ6fb7qAOiVuPUqbJf5+6SUFAjFJrIE6/5MnhUuSYjVsP0LqrK3+ +VewoqbWfhF/eifzDpWgbR4TTg/fm6yiM358edHRfT9ipsjUlZosXvV6MppS5mQXgULJ zzIw== X-Gm-Message-State: ACgBeo1SIJWdXPUXlC2+Ub0uEITPxrqf1WMqX6mSjtVetgNx5IEzQvKL HBRBYygCSEMNBf5Ugi35CjJR5g== X-Google-Smtp-Source: AA6agR6uz6PgHJJgHSkUYGIHiHszn0Dz+54GDEd24Jx76kQfPHB9W+lxiMZ+hmy/E2YYJ90MXmVbyg== X-Received: by 2002:a05:6512:3e1b:b0:48b:6ae:ce4d with SMTP id i27-20020a0565123e1b00b0048b06aece4dmr8496799lfv.142.1660742073304; Wed, 17 Aug 2022 06:14:33 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:32 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 08/12] ARM: dts: qcom: msm8974: add missing TCSR syscon compatible Date: Wed, 17 Aug 2022 16:14:11 +0300 Message-Id: <20220817131415.714340-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org TCSR syscon node should come with dedicated compatible. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 8baca2a77717..0a9f252c88a7 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1234,7 +1234,7 @@ tcsr_mutex_block: syscon@fd484000 { }; tcsr: syscon@fd4a0000 { - compatible = "syscon"; + compatible = "qcom,msm8974-tcsr", "syscon"; reg = <0xfd4a0000 0x10000>; }; From patchwork Wed Aug 17 13:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945885 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 B5E8EC25B08 for ; Wed, 17 Aug 2022 13:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239625AbiHQNOz (ORCPT ); Wed, 17 Aug 2022 09:14:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239126AbiHQNOn (ORCPT ); Wed, 17 Aug 2022 09:14:43 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9FB24F6B0 for ; Wed, 17 Aug 2022 06:14:36 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id r17so18939793lfm.11 for ; Wed, 17 Aug 2022 06:14:36 -0700 (PDT) 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; bh=xXYhGBIEDADNPaF7FntsO5+CaYiCK5EMt2dAgswIP/E=; b=rfesmkR/Z2XkW9U5Ai2BIS8LVP73UN+425tKrx0cDTW1zqLqT2gXDM078/lW9QV2yI sQG6qAJgYSZUG457LxgdNYYIuMkNQq2Za3JQy/YETZEYWpLvm37fPk9RtQlnG4X0V0dK TW066pA7XnpEPtQ1VV1538t+W8+9k4l5WpTNDQpglqG1FRuGBVvBFp43qjaB5IH8sBf7 /JQ9csPnIN4J6v5N5ljLmSk3hCycOvauDqM6gBbkoyOqFswbH9BgtcKwiiWVJ1VwyGT3 KUGbmquXwocSJD4TjlGNAOvzw4v7tG5i7B5vjjJoCY+NAtYpaFy0pSVR5FvRuRxWlByI tFiQ== 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; bh=xXYhGBIEDADNPaF7FntsO5+CaYiCK5EMt2dAgswIP/E=; b=B+E8a8F+4eUMThmmnc6jr0V5/0LblaFQ3nuNDie66+kT3yZ5d+JqobFtqm0z4RFNwk FqY97MolKc0DQWBblsBRQc4IZUjGjIQS6YZPU0RRvjBrwSKcIuc4d0ZbYMa70zPyKxKd t69pFzmg6jHQ4pVOxNz/ZMPyYMziqKmLYqGCzzmTEmprEMb0fyBqskXGd7LsJK39A93W u7WmWtplwfeOGKxMAM2JTy6IOS/N58TrCjmwtHcuvuj4ndPJyYrfkjmTUSZiG5ss0hIA C8VTiLpTMhj37jGQuboy/LzP8ISNe0V/eziUU3DuwgthNxFln1ngGbRibFw3JCmpirIn V+gA== X-Gm-Message-State: ACgBeo2cxTvJWBdKrjwyo1ewD0o6KQGLcV4Jd6ekT2YiUrqN1Y8XSakz QK45uymU2T2yhsbzH4vzOX/52Q== X-Google-Smtp-Source: AA6agR6PDcGKSl5yiOIktlWZ0jUH6eEYd3ChNN0RAz7S7jfXE61WPqYwgJ808qhJjFJUkBaxmtwcow== X-Received: by 2002:a05:6512:2611:b0:478:da8f:e2d8 with SMTP id bt17-20020a056512261100b00478da8fe2d8mr8444745lfb.460.1660742074843; Wed, 17 Aug 2022 06:14:34 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:34 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 09/12] ARM: dts: qcom: msm8974: split TCSR halt regs out of mutex Date: Wed, 17 Aug 2022 16:14:12 +0300 Message-Id: <20220817131415.714340-10-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR halt regs are next to TCSR mutex, so before converting the TCSR mutex into device with address space, we need to split the halt regs to its own syscon device. This also describes more accurately the devices and their IO address space. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 +- .../boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 +- arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 11 ++++++++--- arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 2 +- arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 2 +- .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts index 3051a861ff0c..2709a99e5c4c 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -38,7 +38,7 @@ &otg { status = "okay"; phys = <&usb_hs2_phy>; - phy-select = <&tcsr 0xb000 1>; + phy-select = <&tcsr_2 0xb000 1>; extcon = <&smbb>, <&usb_id>; vbus-supply = <&chg_otg>; hnp-disable; diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index ec5d340562b6..5fd94dd6a427 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -251,7 +251,7 @@ &otg { status = "okay"; phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; + phy-select = <&tcsr_2 0xb000 0>; extcon = <&charger>, <&usb_id>; vbus-supply = <&usb_otg_vbus>; diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi index 5a70683d9103..118b231f3137 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi @@ -136,7 +136,7 @@ &otg { status = "okay"; phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; + phy-select = <&tcsr_2 0xb000 0>; extcon = <&smbb>, <&usb_id>; vbus-supply = <&chg_otg>; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 0a9f252c88a7..4b602410d72a 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1189,7 +1189,7 @@ remoteproc_mss: remoteproc@fc880000 { resets = <&gcc GCC_MSS_RESTART>; reset-names = "mss_restart"; - qcom,halt-regs = <&tcsr_mutex_block 0x1180 0x1200 0x1280>; + qcom,halt-regs = <&tcsr_1 0x180 0x200 0x280>; qcom,smem-states = <&modem_smp2p_out 0>; qcom,smem-state-names = "stop"; @@ -1230,10 +1230,15 @@ smd-edge { tcsr_mutex_block: syscon@fd484000 { compatible = "syscon"; - reg = <0xfd484000 0x2000>; + reg = <0xfd484000 0x1000>; }; - tcsr: syscon@fd4a0000 { + tcsr_1: syscon@fd485000 { + compatible = "qcom,msm8974-tcsr", "syscon"; + reg = <0xfd485000 0x1000>; + }; + + tcsr_2: syscon@fd4a0000 { compatible = "qcom,msm8974-tcsr", "syscon"; reg = <0xfd4a0000 0x10000>; }; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index ff6e0066768b..c264d17e0953 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -89,7 +89,7 @@ &otg { status = "okay"; phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; + phy-select = <&tcsr_2 0xb000 0>; extcon = <&smbb>, <&usb_id>; vbus-supply = <&chg_otg>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index 983e10c3d863..2691a6dbbb8b 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -379,7 +379,7 @@ &otg { status = "okay"; phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; + phy-select = <&tcsr_2 0xb000 0>; hnp-disable; srp-disable; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 3f45f5c5d37b..d2bef3896c82 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -216,7 +216,7 @@ &otg { status = "okay"; phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; + phy-select = <&tcsr_2 0xb000 0>; extcon = <&smbb>, <&usb_id>; vbus-supply = <&chg_otg>; From patchwork Wed Aug 17 13:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945886 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 5A366C32771 for ; Wed, 17 Aug 2022 13:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239102AbiHQNO5 (ORCPT ); Wed, 17 Aug 2022 09:14:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239652AbiHQNOr (ORCPT ); Wed, 17 Aug 2022 09:14:47 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBECD50713 for ; Wed, 17 Aug 2022 06:14:37 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id w5so18962439lfq.5 for ; Wed, 17 Aug 2022 06:14:37 -0700 (PDT) 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; bh=zKHY3dCKJ9MBQUb1nFG5BJ8dnmo7NmfzmU7KoX4k/sc=; b=I7ZGQFpT7TyHMGcPOTq3gyDtAPS8zEGPd42TBrWTkjoqhrt3akPHiIf+w4B76q3aiU 3XI+IhkIVY2r3Iln2cKulCNu3xUaNftz1cSQrvJOifhtA316/9klkiyve6BFAPV1d6VY 7IU70Xb7QNLpKjEkw0Nwv2vr5dKAB23qe8xhrOtM2iIFHG8JPHF0X382o+ioejbk7DZe VPknovP886k8IVr78GTWmL/eyPg7VtoMZjCn9JTn9iGnbCgPfwiGaZlMQqHoTFGdyKMM 9sE2tpSW5DcEJvjaVVBPzOadXu6W0EVGWoaIjpd26RlNBHHvh1EM8vjudDsaBcJ7XFrF YHWA== 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; bh=zKHY3dCKJ9MBQUb1nFG5BJ8dnmo7NmfzmU7KoX4k/sc=; b=XxWFsxrOzwUzhrbYPqrOQNkxWBDscdlZ14sZBDo+dzrTNUz4y3CWkfj3+73YM0fBxE PSZg3yj/JLDui6dY/kBIvKao2+6BUQzZAIKsscE3gKP6rsGjP1MtXLN6b/acaQPQEpPO Nq6GIaFZzCwkCigSsZlgXKS8PD+3oqgLZGt6PuZLJ/SF7/+QMeBpYG9q83EX+3Wb9VIZ FQFf6K6dP1TF0fJP7njj2/A8cZR7KytLR3lXh8i2Z5U4DWd/D5Z9tN3HoBxmtm2flgOB RxuLhAeo8UjXb+unbFaikKlV41GpRcdlwSin1kue9gzAp520VviQo/DQ74IeXHmTEYmw SuQA== X-Gm-Message-State: ACgBeo0RrhTBdHrPa+KXE4ec6M39KhgebTNqv2aWXK7I5ZDvSd+ylP4Z ZS3fwlQz8ZCrokXiERgbDx89Hw== X-Google-Smtp-Source: AA6agR5XGF47v4qdgMgUliUXwW/xR14w/+9RDtpKsUFcdZ7p+r7vapl4D4EGIFCR+LZwwiSCgS0Epg== X-Received: by 2002:a05:6512:32c5:b0:48b:969a:9c24 with SMTP id f5-20020a05651232c500b0048b969a9c24mr8389425lfg.300.1660742076344; Wed, 17 Aug 2022 06:14:36 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:35 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 10/12] ARM: dts: qcom: msm8974: switch TCSR mutex to MMIO Date: Wed, 17 Aug 2022 16:14:13 +0300 Message-Id: <20220817131415.714340-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom-msm8974-sony-xperia-rhine-amami.dtb: tcsr-mutex: 'reg' is a required property qcom-msm8974-sony-xperia-rhine-amami.dtb: tcsr-mutex: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8974.dtsi | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 4b602410d72a..5f674aa819ae 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -1228,9 +1228,10 @@ smd-edge { }; }; - tcsr_mutex_block: syscon@fd484000 { - compatible = "syscon"; + tcsr_mutex: hwlock@fd484000 { + compatible = "qcom,msm8974-tcsr-mutex", "qcom,tcsr-mutex"; reg = <0xfd484000 0x1000>; + #hwlock-cells = <1>; }; tcsr_1: syscon@fd485000 { @@ -1719,13 +1720,6 @@ reboot-mode { }; }; - tcsr_mutex: tcsr-mutex { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_block 0 0x80>; - - #hwlock-cells = <1>; - }; - thermal-zones { cpu0-thermal { polling-delay-passive = <250>; From patchwork Wed Aug 17 13:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945888 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 6F3C0C32774 for ; Wed, 17 Aug 2022 13:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233360AbiHQNPC (ORCPT ); Wed, 17 Aug 2022 09:15:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239816AbiHQNOt (ORCPT ); Wed, 17 Aug 2022 09:14:49 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF8EC52097 for ; Wed, 17 Aug 2022 06:14:39 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id l10so13520888lje.7 for ; Wed, 17 Aug 2022 06:14:39 -0700 (PDT) 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; bh=uXLJl3ZPkfkVvmcRHOHOBnFdkGCya/Ew5ljctJGYsvo=; b=LThxqa07rs/MPV48N0w8kXoiodIcyMBUsQNqxCs/gH3PFDrVGh4PWvL+NXQ+nCb57O wAz+p0MPwvBqAaSenCoapEcgKSxAK4WxYxuOY8y7fN5OQ/on66T8Pn0htKijnE8VlOGk t92RgTzAKkzFe9Mf7ynXFlzG8NlkoNhFLWb3mtkbw3jK4KQiqRiC2bbnWGiHNXGgZ1UV hy3cRXR3fILbUgxgXio6ZFXJz/lf3m6FYOqW9wHLkTA5PON0V19ZEyj1HIomI5hx0vpT 7af9bPe3+VsZ6kxSFqSUmdDjv9Ive3oZ1ezAvw9PSQkJNqngxlD3PEvXXkMTgq5WGR7y Sd6Q== 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; bh=uXLJl3ZPkfkVvmcRHOHOBnFdkGCya/Ew5ljctJGYsvo=; b=2zdqPx5vvjSmH3yDC+wIKMOqJC6GYDKMf/LdRbKt/7JIDMjzwdVTsH6wzyxb+thshP ePESI0PXkhkU/mraOWMoyPvZF3dpksmpqoIGcJ9v/RpYAfJQXMBr1eIIypc+X5I+zJ2p n8VofanNr9tDTDgFNfWVE97OYhXa/F64pB7Vdr5puTnhq7cVNQX+WY5V69EE+P6976Ra W7xOj/6O7og34uKyAbIsUCYg6ig3/Z7qus/O3o1xXiQiG+2P+ZgXwV2e+RGPZsOGf8+1 UYmZOP7oZKKFlgnD6K+MIwYQKbcJbSZRW569Lc/cc7WE9UJ29X0tEn59UUZpOK2AqNSy YcVg== X-Gm-Message-State: ACgBeo2YmtArkYmaQu5ChrleW8KZ3xIn6PHTpVeSs+cBFUhqDY59Lv2B apbtXuFpgpBYAh2QOmRq7nyG8A== X-Google-Smtp-Source: AA6agR4jh/QK3ONB9rVZSBJuYOsHWZBBWf+scOCDnCRRh0UN+NM4NdTkZ2qEXGMavvmupaishF7GOw== X-Received: by 2002:a05:651c:2212:b0:25e:cc38:a1dc with SMTP id y18-20020a05651c221200b0025ecc38a1dcmr8545043ljq.359.1660742077891; Wed, 17 Aug 2022 06:14:37 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:37 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 11/12] ARM: dts: qcom: apq8084: switch TCSR mutex to MMIO Date: Wed, 17 Aug 2022 16:14:14 +0300 Message-Id: <20220817131415.714340-12-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom-apq8084-mtp.dtb: hwlock: 'reg' is a required property qcom-apq8084-mtp.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-apq8084.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index 72f9255855a1..5e07255fe5ea 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -383,14 +383,9 @@ gcc: clock-controller@fc400000 { reg = <0xfc400000 0x4000>; }; - tcsr_mutex_regs: syscon@fd484000 { - compatible = "syscon"; - reg = <0xfd484000 0x2000>; - }; - - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x80>; + tcsr_mutex: hwlock@fd484000 { + compatible = "qcom,apq8084-tcsr-mutex", "qcom,tcsr-mutex"; + reg = <0xfd484000 0x1000>; #hwlock-cells = <1>; }; From patchwork Wed Aug 17 13:14:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12945887 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 8B7E7C32789 for ; Wed, 17 Aug 2022 13:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236017AbiHQNPB (ORCPT ); Wed, 17 Aug 2022 09:15:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239809AbiHQNOs (ORCPT ); Wed, 17 Aug 2022 09:14:48 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C844951A22 for ; Wed, 17 Aug 2022 06:14:39 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id by6so13503371ljb.11 for ; Wed, 17 Aug 2022 06:14:39 -0700 (PDT) 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; bh=Yb2tg6NLcz0SjyT+zhbpZCCAWG7Bnyw4PloKDdxoVAU=; b=StgnaHhGCg7OOpqTG13+gQqRFOCLdTRA/VCywEDqg9kMIxRkqhIjEL6/unZNraETkB OY78slefTO6VmDzp97WDvD8kTArUqhb1NLsuK7dpIINzEiwMK1YWNK9g8TqUfbVweYMm FIgJ0b+KVQtMsadPvgTAwA26rnWXysiwVIdai5xvQ4DdVGOA3ClgjDb5I0IEcgQ+Gv1U pyhxFEJkeL2O6+cfBaxxXSVEhe4+VnOd7U8+etGNUDTddXn7jHg1/sKyJW5B3MseCKzD NP8IjoOxxroQY3Y1ne8qNUgojmtamVj7SkkIGcdYG36ye/FMasRKQE/ytP2+enkQueNs RdtQ== 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; bh=Yb2tg6NLcz0SjyT+zhbpZCCAWG7Bnyw4PloKDdxoVAU=; b=DIH+8oTmZbuD2iqKx7c05nLDdKxkCg+HfNQrtwRpOdEthO121SdolL8P85oyqRX47j 4HVuqzT/m6SxB2fGCeJ6L8qrH/+LGqsPgrPRM62RODqlfllMdz3Z+6A2HhymTZUm+Sca qJUJrQpuLa11CJQYA5hyX92X6g65sEPkCsop7BhAIFDsrWPs6F/YDMNG0FlHBhQ6J2GQ XLXJnHTug1H2439ZtWXe1In7vniD04+IbpWkIue+s0BYn70Op8sEgFTLcvMcbBMlLoAU a1SNTFcYIPviqeJUyqhi/hDsDmXmGKi+nTYDCGo3O8hbKsSBn/S3m3J0/dih9DaV0Mws NIeg== X-Gm-Message-State: ACgBeo07sPJaM9zVrMm4Ro0jLEY3QoHXViW76TzWFcrlmBti+EEpwN58 fpiuVw6AdU7k7jMaouQPYxG7yQ== X-Google-Smtp-Source: AA6agR4Jr9dVJN0cBFc7EFaxXfsdQSVgqEaGe2HDLtNEJ6H2epeCLVj35rKOvxNYeo5RnnOoO2U2wg== X-Received: by 2002:a05:651c:10d2:b0:25e:5a65:9026 with SMTP id l18-20020a05651c10d200b0025e5a659026mr8217403ljn.193.1660742079394; Wed, 17 Aug 2022 06:14:39 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id k1-20020a2ea261000000b0026182f31aa0sm1411307ljm.1.2022.08.17.06.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 06:14:38 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Ohad Ben-Cohen , Baolin Wang , Rob Herring , Krzysztof Kozlowski , Lee Jones , Vinod Koul , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 12/12] ARM: dts: qcom: msm8226: switch TCSR mutex to MMIO Date: Wed, 17 Aug 2022 16:14:15 +0300 Message-Id: <20220817131415.714340-13-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> References: <20220817131415.714340-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom-msm8226-samsung-s3ve3g.dtb: hwlock: 'reg' is a required property qcom-msm8226-samsung-s3ve3g.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8226.dtsi | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi index 0b5effdb269a..efb5d1edc3a8 100644 --- a/arch/arm/boot/dts/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi @@ -44,13 +44,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_block 0 0x80>; - - #hwlock-cells = <1>; - }; - reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -508,9 +501,10 @@ rpm_msg_ram: memory@fc428000 { reg = <0xfc428000 0x4000>; }; - tcsr_mutex_block: syscon@fd484000 { - compatible = "syscon"; - reg = <0xfd484000 0x2000>; + tcsr_mutex: hwlock@fd484000 { + compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex"; + reg = <0xfd484000 0x1000>; + #hwlock-cells = <1>; }; };