From patchwork Fri Aug 19 08:31:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598770 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 B38A6C28B2B for ; Fri, 19 Aug 2022 08:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347242AbiHSIcT (ORCPT ); Fri, 19 Aug 2022 04:32:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347156AbiHSIcS (ORCPT ); Fri, 19 Aug 2022 04:32:18 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF0AE97FE for ; Fri, 19 Aug 2022 01:32:17 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id s1so2432844lfp.6 for ; Fri, 19 Aug 2022 01:32:17 -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=N4cVOvKLw+JRrcyC9iyaAUwD4TmpSDd50ehLIjD+FJ8=; b=LTrLSr8d2izE40ursGNIZ1/Uum5CUAczfSeWIwEnU1CtE8uxPAk8+eaNoBuGKnsy1V kYQLR4EIDZcZPOrmJuzbkBJAJAt2Be7bAsdjxQYUDhhcPfy/vQb2JLuFpk99eienrX4u y06p2PKRXwW72F200b+X0HIavY9rJqtnBxp7otNY5F346lISBkQTjBQKHzBpvn/DDttX 6uxN9VJpklj/YWZW2ZdwWTrKzxyepXk0Rf/tGJALluMRyd4TiiaaXqZbv2mtDlanPnOO 1VQRJOFGqaUB99NV2OuZyyzYuOwFZ0rzAF7lYclTtYQah/0FxHurMtrRSxiAc25OyAPr n4aA== 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=N4cVOvKLw+JRrcyC9iyaAUwD4TmpSDd50ehLIjD+FJ8=; b=E4Vdr1MiR228Yg9Ad6os3o+hg8V+21DejV0wIF0nLI1xe0BgEs22rjVjK2Bw8WRvDC xIK4bn8LYZYGdT4OTUfS2O+wK2kL6cdAZQraqpv8LvBrFB/iDlLytNtL8BJz1pCoPo0M 5koc/0NKaV4tYj+MF0sJwkw/kHikrHChghYpjGNClnLw1X0C8tb/yOnBqwZMcxGnEAAo Ei5be/toFZvowUFoNTMr1LG6ED7Ic7HOvuv4i5xILbPjiLUV512IvxgT1ZhXayN7Swhv NtJDOGpfc1C+rhgaUIMqj8xXFtpx6P9RtPoBx1IGpN7VMg1MHsqDVFIjQH2pIq+bajM1 LP9A== X-Gm-Message-State: ACgBeo3/fQagprnLjMcIvt+ZhX2U730tYrzCnVHyjC5eylhsB80BLgk8 Bc/Zpmh6OApliEv4buJb+C7Lxw== X-Google-Smtp-Source: AA6agR5THR1kx33I9E3d3N3nFfvgn8gtcpulk86lo1PcTv3kHAzcJwC2u917khiPO4EROMZsomS9Ag== X-Received: by 2002:a05:6512:3c9b:b0:48b:40ea:c9f2 with SMTP id h27-20020a0565123c9b00b0048b40eac9f2mr2036846lfv.170.1660897935494; Fri, 19 Aug 2022 01:32:15 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:15 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 01/16] dt-bindings: mfd: qcom, tcsr: add several devices Date: Fri, 19 Aug 2022 11:31:54 +0300 Message-Id: <20220819083209.50844-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Document existing (MSM8996, SC7280) and new compatibles for TCSR syscon registers (QCS404, SC7180, SDM630, SDM845, SM8150, MSM8998). Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring --- Changes since v2: 1. Add more compatibles. Changes since v1: 1. Correct order of compatibles. --- Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml index 2f816fd0c9ec..d3c25daa995e 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml @@ -18,6 +18,13 @@ properties: oneOf: - items: - enum: + - qcom,msm8998-tcsr + - qcom,qcs404-tcsr + - qcom,sc7180-tcsr + - qcom,sc7280-tcsr + - qcom,sdm630-tcsr + - qcom,sdm845-tcsr + - qcom,sm8150-tcsr - qcom,tcsr-apq8064 - qcom,tcsr-apq8084 - qcom,tcsr-ipq8064 @@ -27,6 +34,7 @@ properties: - qcom,tcsr-msm8953 - qcom,tcsr-msm8960 - qcom,tcsr-msm8974 + - qcom,tcsr-msm8996 - const: syscon - items: - const: qcom,tcsr-ipq6018 From patchwork Fri Aug 19 08:31:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598769 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 52E61C25B0E for ; Fri, 19 Aug 2022 08:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347313AbiHSIcV (ORCPT ); Fri, 19 Aug 2022 04:32:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347156AbiHSIcT (ORCPT ); Fri, 19 Aug 2022 04:32:19 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E688E9908 for ; Fri, 19 Aug 2022 01:32:18 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id z20so3892054ljq.3 for ; Fri, 19 Aug 2022 01:32:18 -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=bSmakT1vdCHgEKF8qCqyNm6SNZVWPZI3wfwFHGWqtB4=; b=CCvUcvjt98Fr4igCTaHPTFj+RnhBjAOxYI3X2/G0dWEV3CrvNwsGLwhQFia3yLImcY j59ivJ/dZQOyZXNT5py+SKq9+sh6n78YoRpKHkVcNzLZ+DYqcwbR2sh8VYrDLemXXJu4 NXLdNdr3BA/VkK34JUz4FcAShKHcOxMCBSlVC8tXnCKCxma4hNajIWyBgaGtfk7uhZz7 GFt1KezmcF7rd+ygh/9iq/vqdFEsRS30vaZ1Qb82wevhasB85ZXudr3TaFW9qZUXNNNw sNR4v4hw6+X2oTkGLGkNZfgcKjrs+A113WpERHpU1MnrVDo3+1BR4fFVw9CwpWQQUFcR m9Mw== 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=bSmakT1vdCHgEKF8qCqyNm6SNZVWPZI3wfwFHGWqtB4=; b=ruGxrg47sfk8A5SgTyPhJUp6sKZm0UnQeh6SPKvbShs1dFYv8CtmML4IPff59HJpJo +HULnK+NS/9ZS/jT2sfkH6VUJVGiWEekTt6pWyO4TpC3oOFqEb78cvxASeTlKRL6gR4b 5bhgxOTulv8APGM7J4+nDWNFZhVZmhmlztu4X1sZsr75EGwQq/FACR7V0jP7KYhV46S/ 8iqSJPi9WFo0CIqw8kZ7ekNQJehIts9TwINItzmmbvswQHSFvNHoeaoOPQZAzoUqEZ6z 2mpJjoTESQE4C+qB5rvZtuTb7Ci87GfLMu/IZs8mwfMqKYOQ8Vs7HjCeSCEjeHXJKsXy IlnQ== X-Gm-Message-State: ACgBeo1fq3D6Cyfgydy/9E2R6XxJiNDYhMQoED9KgmC0lhdp6HYxn99l 5BkBXu3cMpGGu5KZGF2+R2cMRA== X-Google-Smtp-Source: AA6agR79bH3x4HCzZtPJLf+xIcNftzO6hiXEXp2Wgv+HLmznRikp9QsLsVuu6Qe8yQ9KCHYZEaVt7g== X-Received: by 2002:a2e:be06:0:b0:261:be8b:64f3 with SMTP id z6-20020a2ebe06000000b00261be8b64f3mr460430ljq.193.1660897936812; Fri, 19 Aug 2022 01:32:16 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:16 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 02/16] arm64: dts: qcom: msm8996: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:31:55 +0300 Message-Id: <20220819083209.50844-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 742eac4ce9b3..3411ced96db6 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -359,7 +359,7 @@ opp-2150400000 { firmware { scm { compatible = "qcom,scm-msm8996", "qcom,scm"; - qcom,dload-mode = <&tcsr 0x13000>; + qcom,dload-mode = <&tcsr_2 0x13000>; }; }; @@ -840,10 +840,15 @@ pnoc: interconnect@5c0000 { tcsr_mutex_regs: syscon@740000 { compatible = "syscon"; - reg = <0x00740000 0x40000>; + reg = <0x00740000 0x20000>; }; - tcsr: syscon@7a0000 { + tcsr_1: sycon@760000 { + compatible = "qcom,tcsr-msm8996", "syscon"; + reg = <0x00760000 0x20000>; + }; + + tcsr_2: syscon@7a0000 { compatible = "qcom,tcsr-msm8996", "syscon"; reg = <0x007a0000 0x18000>; }; @@ -2413,7 +2418,7 @@ mss_pil: remoteproc@2080000 { qcom,smem-states = <&mpss_smp2p_out 0>; qcom,smem-state-names = "stop"; - qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>; + qcom,halt-regs = <&tcsr_1 0x3000 0x5000 0x4000>; status = "disabled"; From patchwork Fri Aug 19 08:31:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598558 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 295A0C32773 for ; Fri, 19 Aug 2022 08:32:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347297AbiHSIcW (ORCPT ); Fri, 19 Aug 2022 04:32:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347282AbiHSIcU (ORCPT ); Fri, 19 Aug 2022 04:32:20 -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 7C71EE990A for ; Fri, 19 Aug 2022 01:32:18 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id v4so3930189ljg.0 for ; Fri, 19 Aug 2022 01:32:18 -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=qy9TWkJXZUtfWQLTmK1W0ItQxoNRQincIzjRzs6MIKA=; b=vX0/jTHc82btt23YwOjDhmsjce0tdypxUEa1vZJFlByPF5N1iXDKckLBAd9/M5pEMn vJbHO3sJ+QhTWfxUDzNolo5PYfdSOU24IM1mVye0e5WQ8UZIUAfXiRXS8Sl747hsCdra iuBehp2aY1PJxnbuYx2RFGg+InVWBU9fkvoyDGjafwLPm7dsnqxuA+pBuuPAlW95O8vX IKdnBeHmTBg07dfQoePP6SzcJbBADk20PhAj9qrGMAojPFb9jCyfiwK1tu7wKE38RrPu I7f6FE443sXjCk9ryTVd0kbMP6fBx4QzVh9Uth1N99tze+StexA3aTi0+KWgJCpx2Xl/ dsTw== 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=qy9TWkJXZUtfWQLTmK1W0ItQxoNRQincIzjRzs6MIKA=; b=YzwACr+MOcgfJ19KHLrZVrNZws8U/cyJ3tHgpLlQ7nvO4GaGehYlTkKtEx3KuJWmU0 TrC4JrFFayZFORDvZkS8OY7Ad3fn2ekXZ0Lo9s4afjIdECgwIZ18kcVF8/b7rhgk7tQj cpIf6eFH7rwzwGm4AORwTXw/MhBpitpm+caa71Y7+7UiNQoQARc3HcY4H9xYUaFo6UX+ XtGaa4qz3E3Y1+ObxaVOasoBxV0keXVKPnBK4e9K0WUuqo6Z45BUkPyF/cP0CKpfZcmW DOWg+frxAau+Gd+qa+jrkhOWHgFdtT9cGmpGgE2swdZTPwh7HFh8hyQ3R1eR8n7nOf2r cIJg== X-Gm-Message-State: ACgBeo2XLdLk/NVtuZia3sVWZLRlvAW2baN9dz40rWObith1tgRi8h/C q4EXoaeF5gi9i8R2SdQjkcwZiQ== X-Google-Smtp-Source: AA6agR5BgMAA8ole7CO+TTXK5IFql3pEQSDpaD4Q/U9GU4pEqaF2Xhd+deXfcE9Fd3tOJvGVx+8cDQ== X-Received: by 2002:a2e:9b47:0:b0:25e:6dac:8c8c with SMTP id o7-20020a2e9b47000000b0025e6dac8c8cmr1915596ljj.113.1660897938075; Fri, 19 Aug 2022 01:32:18 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:17 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 03/16] arm64: dts: qcom: msm8996: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:31:56 +0300 Message-Id: <20220819083209.50844-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/msm8996-xiaomi-natrium.dtb: hwlock: 'reg' is a required property qcom/msm8996-xiaomi-natrium.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 3411ced96db6..166374566a49 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -363,12 +363,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the reg */ @@ -838,9 +832,10 @@ pnoc: interconnect@5c0000 { <&rpmcc RPM_SMD_PCNOC_A_CLK>; }; - tcsr_mutex_regs: syscon@740000 { - compatible = "syscon"; + tcsr_mutex: hwlock@740000 { + compatible = "qcom,tcsr-mutex"; reg = <0x00740000 0x20000>; + #hwlock-cells = <1>; }; tcsr_1: sycon@760000 { From patchwork Fri Aug 19 08:31:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598768 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 BB57EC28B2B for ; Fri, 19 Aug 2022 08:32:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347520AbiHSIc0 (ORCPT ); Fri, 19 Aug 2022 04:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347343AbiHSIcW (ORCPT ); Fri, 19 Aug 2022 04:32:22 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 111F2E97F0 for ; Fri, 19 Aug 2022 01:32:20 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id z20so3892148ljq.3 for ; Fri, 19 Aug 2022 01:32:20 -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=5WfuABgGkL9AfK5HJrbpixzed3bcUcc9/3Q45QgNRXA=; b=Ak1QpTr/VKgCehxKnxF4AVejAldH2KkNQfQzNsGLMm2tObgmonqMF/UtYy12/dJ3gw dSYoWGDuofnANi9zuQLbbvCM5dFGmcZjf4QrC8Ct2PznxP9Yep4fnItYam4hEW6Zhg9K JoMGzVyhay/L+ctJetYYSOtMfvlTD1wXZQpk+ab8aaB8i4KO6ANrz/PE0Y+rHqqUaFhF guBFgKEfPxAKoMjH9MtM5U3nCFKdLghP3/70KnBcb7APTv3xoEqPnaGIqHVxRWAYLNLB E+9o0q6jFukdpzahrP0bAZZSQfxAUqtTzhbJVbaN2rYkyxChXkaJ7O2pwvCiYbis2GBO VKpQ== 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=5WfuABgGkL9AfK5HJrbpixzed3bcUcc9/3Q45QgNRXA=; b=kgbvcrb5KmNom70FJrJCxVl+39npUqS8xECtqROCR6Pps5rurqVfgyZGO4fLEMJ78/ aHlZuL4ogDEp6hEgCsRAimNriCk02QGZfLEH1H5nO45RCKWZyPeP/fZTSEOkRgSO1Rjy iJ0ph4Ar2AsoG7ElbQGSXH9IXmPc2iJL81OgnkfK56k0LAsYMfguVaZCfZX2/OJsJDhy AVUQUnqRfI91qoLUUqBFqDuPu+/Uk5kI7BOopIgAH2oqUCDvDZfHLmTt/gvJG4oiyY9t QKl9kRiLealWglhS+cEpZGyPbXeLioRFJdpNsoF3BZ1RVRJWNqJzDEyfFnGZhIXpSzON bGMQ== X-Gm-Message-State: ACgBeo2gZT2PaYIsCIAhB1r2lW3+5QOvGWJLZFmnB8FIKoHZQlMh5pjz 8yAz215E3JQGOTp21ZoCZrJ3Mg== X-Google-Smtp-Source: AA6agR7Ph2MRxoCWXinqtcheu7CvhmScE8OpNiYuTQCdKm1lTOpi/K7x8dS/H00qwV7GYWbPqcn1dA== X-Received: by 2002:a2e:b8d5:0:b0:25f:e94d:10a2 with SMTP id s21-20020a2eb8d5000000b0025fe94d10a2mr1993685ljp.274.1660897939400; Fri, 19 Aug 2022 01:32:19 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:19 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 04/16] arm64: dts: qcom: msm8998: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:31:57 +0300 Message-Id: <20220819083209.50844-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 02d21bff2198..f0806ed103f1 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -1049,7 +1049,12 @@ ufsphy_lanes: phy@1da7400 { tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; - reg = <0x01f40000 0x40000>; + reg = <0x01f40000 0x20000>; + }; + + tcsr_regs_1: sycon@1f60000 { + compatible = "qcom,msm8998-tcsr", "syscon"; + reg = <0x01f60000 0x20000>; }; tlmm: pinctrl@3400000 { @@ -1340,7 +1345,7 @@ remoteproc_mss: remoteproc@4080000 { resets = <&gcc GCC_MSS_RESTART>; reset-names = "mss_restart"; - qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>; + qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>; power-domains = <&rpmpd MSM8998_VDDCX>, <&rpmpd MSM8998_VDDMX>; From patchwork Fri Aug 19 08:31:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598557 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 D8B94C3F6B0 for ; Fri, 19 Aug 2022 08:32:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347591AbiHSIck (ORCPT ); Fri, 19 Aug 2022 04:32:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347429AbiHSIcX (ORCPT ); Fri, 19 Aug 2022 04:32:23 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA640E9908 for ; Fri, 19 Aug 2022 01:32:21 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id s1so2433069lfp.6 for ; Fri, 19 Aug 2022 01:32:21 -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=eD+vvaVGBlUcCXOKP3ANbRbef4Wta7oOIdhhSq0Fgqw=; b=w7xq+DeKlMgrmICZ39PCb/6Q8yvh730lY6ThiE6Ll7EFTlbvqgps24gBpg1JjHBKaZ eWyxoYwBe2niTLmtulRMg7V1e8JrCWBA+KR5a8L97cLSGVFYYZqAI+5hGuGbcHgfID0m Y/9nXpVJaE567RihAUPGmgxsYcQOcUdqytIafR1FpXS2b4GXYPznb5xc/zhmjnUew5es MPtD6R6dWK1VwWoKWJoq1EnJHEvdoeip6tNada3AWbAUXQL2MVKCoVDt5/viyOiMYaNV E4PCAVT7cOpwfK8eal5W6TrnTfhK1NW7Yxi2z4GatkXaqDmIex1iI3uqJ0kyLCRFjdtv 2vSw== 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=eD+vvaVGBlUcCXOKP3ANbRbef4Wta7oOIdhhSq0Fgqw=; b=yLIV6Bur4bOCibYuauogFqh8xSz/0YxxAzU8uwp2boyKAv3zhOFnAB4i3rTh8lNusl o+KdSZYBXJR5jJ6yWvKGfefnBEueUY14eEmYGDZS/rok/MAkO9SpgpwhhxMrOPsA09oK 31QU5T1MtUhbFjiyu2FH0cXySZhYWNyNUbW/azBvv6yiA3V2kdVhF8EKwCZldcNkCUy9 gHFlJB7+3f93XR34S0n/lYR/IXwpB/Wq6Ke10upCacsQ+t52CeoY4bShozqR7XFTadgk q3lWuJGi1THBx6EN5bf5mZZ7nirRX0zw0tfImKcByxddL9heQZ61EVf/+eg2ZozkekYQ +nAQ== X-Gm-Message-State: ACgBeo0EvLQhn2T842CE31ZRZk/aQQdAVDcelxh18/jxuAPmVtarjm/u FVyXWt/tPvKATjT7iEdMkWQ93Q== X-Google-Smtp-Source: AA6agR4AdJbHeukS6kjEOmGNyNW4p1APIhICE/o1N4MSxFkbRJiScDApC1w50+Jh+Im7FEGG7tSNdg== X-Received: by 2002:ac2:482d:0:b0:48b:2373:9980 with SMTP id 13-20020ac2482d000000b0048b23739980mr2042813lft.97.1660897940996; Fri, 19 Aug 2022 01:32:20 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:20 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 05/16] arm64: dts: qcom: msm8998: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:31:58 +0300 Message-Id: <20220819083209.50844-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/msm8998-asus-novago-tp370ql.dtb: hwlock: 'reg' is a required property qcom/msm8998-asus-novago-tp370ql.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index f0806ed103f1..22b2da74d105 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -308,12 +308,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - psci { compatible = "arm,psci-1.0"; method = "smc"; @@ -1047,9 +1041,10 @@ ufsphy_lanes: phy@1da7400 { }; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0x01f40000 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 { From patchwork Fri Aug 19 08:31:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598767 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 A0086C28B2B for ; Fri, 19 Aug 2022 08:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347638AbiHSIcn (ORCPT ); Fri, 19 Aug 2022 04:32:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347542AbiHSIc0 (ORCPT ); Fri, 19 Aug 2022 04:32:26 -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 DA579E97F8 for ; Fri, 19 Aug 2022 01:32:23 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id n24so1843060ljc.13 for ; Fri, 19 Aug 2022 01:32:23 -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=Wsi3drafxqLS5hS9Kxb/pKatr5Z8SKnnBwYatfij3pE=; b=bCx2wf7Gj13i2aYFNWF1S2YJa3874Em7xBh3dz+DlznXqkiHAbqCp7Lmvx05DjVx49 8MokVyRwI6Hu4E0Lu8oRWqg39+m/+i1cxYR3KFSIgRI6wzlcxL3L7ZWOfiJJHptW86bq E3qU/3lqoeyvWooRjBl5bnSjrxyBt04/9POIs+Ey7XJiprekCNEU8VggbykzRC4gjrvt B4RdsniibMPgWMkIoBhoyI60N1bG4NanhOdSr8UB+M/XI2vDHp+q4Ro7ogu+RsqG3ARn /bV1tUzvmFEd13YWxNtiZJmHjkTjyLfCKTd75MWCKqd76PFUaWiDnEC7MzIV3WaUVZCt 3Gmw== 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=Wsi3drafxqLS5hS9Kxb/pKatr5Z8SKnnBwYatfij3pE=; b=Ee/UaDiHfCUtQCvSTyRH7bST1IoGyLZ/4XFf/x4FBcxwULYEPHkOJREx0csHHcB6QS gMUkIxV/AyAwuTlWn0tlaxY1hgWjMTCYzoXQoFX8uaNXKcOz2a0znA5p1JFnQVlTiB9I zbNZwqsuw4nvuaQUflw6Ikz8H7I0BTlQT2eUeGDcPGili6zTb3DC13jtaaD8xAeWlnnX 6kXBHkRDYAy+OHlllmgnXKJKOYyyV/V+SanCWbEjNcG0h+Sbyp142kMLDnO0TuxkHGe0 iXZ/+iShvc9HKAAWDq85GoNn01W6Ktf6U/7E+j2QUqNnqDSIvHCzWIHvwLTKquMxghFy DTSA== X-Gm-Message-State: ACgBeo3K5LLazEWmxSSy8Db72ky0eVzzA/SNCL92frYGGPmIotMyNru0 Ng17CIkB4meaE1hl5zoXTVlFDg== X-Google-Smtp-Source: AA6agR6A2YcKoHFlzcNoal/jwdNC0x/6ogLThhKLnILp0GCISzgz8kd/p0I0Hfb65XJ4cujOuJ2oGA== X-Received: by 2002:a05:651c:23a6:b0:25e:63bf:c46f with SMTP id bk38-20020a05651c23a600b0025e63bfc46fmr1901220ljb.76.1660897942256; Fri, 19 Aug 2022 01:32:22 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:21 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 06/16] arm64: dts: qcom: sc7180: add missing TCSR syscon compatible Date: Fri, 19 Aug 2022 11:31:59 +0300 Message-Id: <20220819083209.50844-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org TCSR syscon node should come with dedicated compatible. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index b82c335c25af..49f28cb531f6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1468,7 +1468,7 @@ tcsr_mutex_regs: syscon@1f40000 { }; tcsr_regs: syscon@1fc0000 { - compatible = "syscon"; + compatible = "qcom,sc7180-tcsr", "syscon"; reg = <0 0x01fc0000 0 0x40000>; }; From patchwork Fri Aug 19 08:32:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598556 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 8CE27C32772 for ; Fri, 19 Aug 2022 08:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347670AbiHSIco (ORCPT ); Fri, 19 Aug 2022 04:32:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347479AbiHSIck (ORCPT ); Fri, 19 Aug 2022 04:32:40 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10AF7E992B for ; Fri, 19 Aug 2022 01:32:24 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id x10so3890083ljq.4 for ; Fri, 19 Aug 2022 01:32:23 -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=txjXCRtOELuunkCVXNi0V+0kB2LPofpz702NPuFtQkk=; b=WRo0rSEUtXYkkgU2C5eUCi8no3l41nxekq4KYhtKWXLw17rKIRxMDevgKTOadNaswI T5IhnPrrfeK1kO8NO8FSkT3yKAlnLbGPc4jiAyA/jwCvs/o5V3kEub3lebz7qvSE5yO5 av0KlJhL4k3Ot0DwqQB0fZGserk+d7JyKPGy3/TvwkPivyF2DzkU48PHf0RRmXt5fVaO qUyngmY5mosnEunSSgpKyjcnpBfr+KXuTDiCopqBClqAWQSR5vbQF57NDeRXwRokZiBd k5zShAn096Y713nnFW9rb9+VYA90JBlAT35gmsypAQARbothyuMm5WutD7DrOhWo0Zbe EIUg== 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=txjXCRtOELuunkCVXNi0V+0kB2LPofpz702NPuFtQkk=; b=iE6I4qVVoNC9rdjgE13CPK/cX5q1Bezp14GO95yennfxOXIR6jI5vTENBBP+KvZjI+ Z6ePMEXLAbZY27lUc/R3G7xx+GmlXhQRbta4GOI7Jsl44/7amxmswZZnuKLDMyOl+dbj awK8lftTF3jbwZabYaUTHdwK0q+V7qkdp/+J3hugXBbrPiB1CvHwaAeOx5zJTVhoQRlS 43KHJWn0xKMjEtQcWusPUrST0uL0tR+JcxIQIB46nPTz6kXmJCzWRavHqd0gknow/Uei y3I7BlUrTpo8No8EdKvV9F96sHN0ngKcyFKAFebH5KIVaqeyCJ4APSzrDpfixKA3VKnu ArsA== X-Gm-Message-State: ACgBeo1BkNgfkgXxep/jSsA3lY+Qex7QmJ9RHuI5Mgi63CG5f2iELeVQ tuBNB5eEbwWSZpxx6Ru1XFtzTA== X-Google-Smtp-Source: AA6agR60V4CvViYgSN+CSY/0Z+KZgBs1aH1KfkqRX4Lh7lZX4cZinLOIDaoJsobPydS9XPWJzZ6JBA== X-Received: by 2002:a05:651c:50e:b0:25f:f52b:3c91 with SMTP id o14-20020a05651c050e00b0025ff52b3c91mr2042344ljp.391.1660897943626; Fri, 19 Aug 2022 01:32:23 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:23 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 07/16] arm64: dts: qcom: sc7180: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:32:00 +0300 Message-Id: <20220819083209.50844-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 49f28cb531f6..5d2dd21da79c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -1464,10 +1464,15 @@ ipa: ipa@1e40000 { tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; - reg = <0 0x01f40000 0 0x40000>; + reg = <0 0x01f40000 0 0x20000>; }; - tcsr_regs: syscon@1fc0000 { + tcsr_regs_1: sycon@1f60000 { + compatible = "qcom,sc7180-tcsr", "syscon"; + reg = <0 0x01f60000 0 0x20000>; + }; + + tcsr_regs_2: syscon@1fc0000 { compatible = "qcom,sc7180-tcsr", "syscon"; reg = <0 0x01fc0000 0 0x40000>; }; @@ -1932,8 +1937,8 @@ remoteproc_mpss: remoteproc@4080000 { <&pdc_reset PDC_MODEM_SYNC_RESET>; reset-names = "mss_restart", "pdc_reset"; - qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>; - qcom,spare-regs = <&tcsr_regs 0xb3e4>; + qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>; + qcom,spare-regs = <&tcsr_regs_2 0xb3e4>; status = "disabled"; From patchwork Fri Aug 19 08:32:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598766 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 113B3C28B2B for ; Fri, 19 Aug 2022 08:32:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347151AbiHSIcp (ORCPT ); Fri, 19 Aug 2022 04:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347595AbiHSIck (ORCPT ); Fri, 19 Aug 2022 04:32:40 -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 C7109E9931 for ; Fri, 19 Aug 2022 01:32:26 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id z25so5255414lfr.2 for ; Fri, 19 Aug 2022 01:32:26 -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=8kKp2gVxl2IVtU6eBY60iDxS0j0PaTIOrvwgxTS4yV4=; b=WjZtC4ADWuqaywxx98ACB+Zd6WWZIbxhCkhYbD1R5SPGwubtGl7crrwW3VZqDwKv4l qspJRZMkY0RPZOfvEg4miGXS1EnV0EkmjbsZdadw21AGgYjsSNnuixwYOhsc44mOYf6S CfemEizejIsVbK8aGAZZC9W1rh1CD82bRS3TFq1brO2zjwlnEeBUUSXYCM+LvBSlaFrl 3UsGCFXtuETx2OBDAc0NNfoLmxSWMGSZnSTGuobKg6H4u++ch1RrQlYpf+dk+n7rCevt L9C1rEjdG/YlOMcAbfujTDbTPyOu1Kiz2NKMoUgD00SNZNS7927Yk0kOw4c89LUiA7iy OT9g== 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=8kKp2gVxl2IVtU6eBY60iDxS0j0PaTIOrvwgxTS4yV4=; b=fIyEQiqPj9oimy2ORMaPOWBfURzDOAHoFQrYhYtw/qZ+lUXKWtal0vxqWpBnRfhkhw fOj0m1GY/Av6HVLqOn1G8H+ckUG5Vj33j/82Z38Clmnbo8PUzxFIzJUIsd1fxmy689Fr dDO/YN5UJUuaM/GYTXD4nxV4j3nTYvswFPIJ8qg/RiSpvpZ+n5kz4tLmiQMEGNew7O3u kUiOuaVRS0KnnlM84//71vH0B31yrLyibJo/MCiwDO4Rfle5m2jFc8LhbxKVSCvDcG7O yfu7mOovSV1XeE2c3jSUgfIOwnp5X1Dm76iosudN/PXunwbduMThfSMnE0aGb53SRBMe 2IjQ== X-Gm-Message-State: ACgBeo30txHZEKsvZzQwAd3VCnEWtMAIVXIv05kgxI3TUNgkc1q6vpfc 7L1yeBvYgJiF1H7oKZL45n3dYA== X-Google-Smtp-Source: AA6agR5isHHMh5jJA4xgLZE7AfZda2RabaQQ8z+Srqh3cVKl26ot3hQsxzAxApePeqsJZhIoaQLobQ== X-Received: by 2002:a05:6512:3d08:b0:48b:123e:fcf3 with SMTP id d8-20020a0565123d0800b0048b123efcf3mr2080662lfv.418.1660897944944; Fri, 19 Aug 2022 01:32:24 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:24 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 08/16] arm64: dts: qcom: sc7180: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:32:01 +0300 Message-Id: <20220819083209.50844-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/sc7180-trogdor-wormdingler-rev1-inx.dtb: hwlock: 'reg' is a required property qcom/sc7180-trogdor-wormdingler-rev1-inx.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 5d2dd21da79c..e8debb0da411 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -555,12 +555,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - smem { compatible = "qcom,smem"; memory-region = <&smem_mem>; @@ -1462,9 +1456,10 @@ ipa: ipa@1e40000 { status = "disabled"; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0 0x01f40000 0 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 { From patchwork Fri Aug 19 08:32:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598765 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 23571C32772 for ; Fri, 19 Aug 2022 08:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347458AbiHSIcr (ORCPT ); Fri, 19 Aug 2022 04:32:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347620AbiHSIcm (ORCPT ); Fri, 19 Aug 2022 04:32:42 -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 3843BE993C for ; Fri, 19 Aug 2022 01:32:28 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id a9so5201026lfm.12 for ; Fri, 19 Aug 2022 01:32: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=r9Tkhs8iRZKA/xD9KN/+OgaKLtO/SCM3ARj69+DISGs=; b=zh6eWeXmxOqbTaUiUKsju+FNFWmsNstbBDDBboZI42HImzRtnU3ztlpFZAiPMHnjFR V4BuQrft+UoJx4szA/dkwsZJvOnb8Y5ylF6vEz/b6ne7RislpT4LrKoYSWgeD5NbR2EE Hok2LVuOUF21WrwRyYhRU5IP48RehmquufONZKHTGD8SDdoa693E1o2n2f+rVg8v8EUW oS/AdrNR9sJt2t8/KgtKYHzKdf+tfTcWSf6OHqWi0JzyTq39mCJFsXAAaGqF6lRGcp8l kabBjmojFm7TgzXqbqwxGfr87R2SS2kHoyA0EdsqMYUbKQmK91ogvmFK5J3f85GfOu+P VEMA== 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=r9Tkhs8iRZKA/xD9KN/+OgaKLtO/SCM3ARj69+DISGs=; b=D/tITKj1GQQt35WOGlmDIR6wHJ/qmj8CRGuQCfF4Jvd6AQWwJgkYej13C0ashKwdvW Wx7hNFjNkTfkaUQleTepUJMTXfRXwYd7L/qmGVIU6qprRaIvkVD7fz1El1ji0VxKyMbd HUSfZiozgYwNczNgECjsoNK5jc/FS+4NJ/pWlzO61kFZwMvvXhBffEsCLacfA6HNqKO6 BQQn/ce5v9a+7hf3kgnWckPBVLn8A7khvNAktlUZ/c0PaQY/BFqFOVfOAjmdDX1pBYYi ZMyd5b6kj78N+6XhcqwOZC2Pr2kL+LtjpaIVGT7IvHGoE/X57Tx49XuBP/DSnqR8u5nK m7WA== X-Gm-Message-State: ACgBeo0Wk4/GfYl6FTa7DjrrxgwcvR70GjanWTlGXEbLIbKgg9mpa4H7 hlK3tQDUdJWm3iMiXVSCs2C7pA== X-Google-Smtp-Source: AA6agR5FIc0QGMG/pMBu109cR90TvStFdFPoZIj7ftDcLQh/GukBI9Rw0g1pIyYWxjf/6HiU2bpYiA== X-Received: by 2002:a05:6512:118a:b0:492:a32d:3678 with SMTP id g10-20020a056512118a00b00492a32d3678mr1963460lfr.259.1660897946189; Fri, 19 Aug 2022 01:32:26 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:25 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 09/16] arm64: dts: qcom: sc7280: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:32:02 +0300 Message-Id: <20220819083209.50844-10-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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, and allows to remove incorrect syscon compatible from TCSR mutex: qcom/sc7280-herobrine-crd.dtb: hwlock@1f40000: compatible: ['qcom,tcsr-mutex', 'syscon'] is too long Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 13d7f267b289..89a8e6b9822a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2155,12 +2155,17 @@ ipa: ipa@1e40000 { }; tcsr_mutex: hwlock@1f40000 { - compatible = "qcom,tcsr-mutex", "syscon"; - reg = <0 0x01f40000 0 0x40000>; + compatible = "qcom,tcsr-mutex"; + reg = <0 0x01f40000 0 0x20000>; #hwlock-cells = <1>; }; - tcsr: syscon@1fc0000 { + tcsr_1: sycon@1f60000 { + compatible = "qcom,sc7280-tcsr", "syscon"; + reg = <0 0x01f60000 0 0x20000>; + }; + + tcsr_2: syscon@1fc0000 { compatible = "qcom,sc7280-tcsr", "syscon"; reg = <0 0x01fc0000 0 0x30000>; }; @@ -2522,9 +2527,9 @@ remoteproc_mpss: remoteproc@4080000 { <&pdc_reset PDC_MODEM_SYNC_RESET>; reset-names = "mss_restart", "pdc_reset"; - qcom,halt-regs = <&tcsr_mutex 0x23000 0x25000 0x28000 0x33000>; - qcom,ext-regs = <&tcsr 0x10000 0x10004 &tcsr_mutex 0x26004 0x26008>; - qcom,qaccept-regs = <&tcsr_mutex 0x23030 0x23040 0x23020>; + qcom,halt-regs = <&tcsr_1 0x3000 0x5000 0x8000 0x13000>; + qcom,ext-regs = <&tcsr_2 0x10000 0x10004 &tcsr_1 0x6004 0x6008>; + qcom,qaccept-regs = <&tcsr_1 0x3030 0x3040 0x3020>; status = "disabled"; @@ -3259,7 +3264,7 @@ remoteproc_wpss: remoteproc@8a00000 { <&pdc_reset PDC_WPSS_SYNC_RESET>; reset-names = "restart", "pdc_sync"; - qcom,halt-regs = <&tcsr_mutex 0x37000>; + qcom,halt-regs = <&tcsr_1 0x17000>; status = "disabled"; From patchwork Fri Aug 19 08:32:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598555 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 F1CE3C32771 for ; Fri, 19 Aug 2022 08:32:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346836AbiHSIcq (ORCPT ); Fri, 19 Aug 2022 04:32:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347619AbiHSIcm (ORCPT ); Fri, 19 Aug 2022 04:32:42 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1184E993A for ; Fri, 19 Aug 2022 01:32:27 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id l1so4706253lfk.8 for ; Fri, 19 Aug 2022 01:32: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=E+17Qxxn21Uu6LvEIhuc2ojzyXZWgnM8bM1M23WOvqM=; b=eI9FvXYmtBy87bejmWl5mEBHmnpmC7hddgW4zvoPYswRxCfZPtIStdiZQoc3w471zE 7a/UsxfxMsv6UjIU1XJW6E3DDiNY/2kzkUM5UK69YvYTb57v0d9CIt9Pn6wxNqoLmqQP N5smsEcImoMBmKkdOceOsr3JFPaYci94XqzaFKiBZBgrmpF8ptBpsQukaj5+3mCCrxtH ydz8mQ+wgp87aQuejZvQ2tkEAlxH0cAFM6DqubZ5VXh+hLi61NbW9ql4UJ3bH7EFT7yb MblCen9Op/zruiVde3V9PhMTcqVUqZSQdPNmDF+K89coHvlsl9AYE7tXHE/jDRik4hOD ICzA== 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=E+17Qxxn21Uu6LvEIhuc2ojzyXZWgnM8bM1M23WOvqM=; b=N+gFo6hVaas8YECc0/VY6LAJ4uorhc6PATtHf41ziQA6XVeHlQfedsst+tJzQ2lg9j OITsKq63qcqrOVeiyfSWcqD1JQ2rpnEuc3ki11UsonMX/L4hH+7lh12cK5+VJN9wTarq ux9MJ4dPwDtzWS3KEO+K6GewaLo3rkloDA9FBNEgGl5ndGM4VEazp05DutcZ6B+AXeFM tkbWOYBjbKZ4MNjmtSm7ttDEv9tOhn3Lk9gu2g++1LvjTGDUo2/JR6udPqCmSeheRRQV VTl4Mlx8XM2xt6aM/4BYi9YKIGVPIbytkVJanAONsDNUYhBVC24fbrydM/AuwXkmOmN5 UjGg== X-Gm-Message-State: ACgBeo2a6TjWM20aCPYuhSO90NuJMOm7Kgny3boPVwSMic8BEkdIxxOn QYUzi+y9p4iwHSulDy6CqiuApw== X-Google-Smtp-Source: AA6agR65Pux9Q6UuNKdMfHI9jiKB+6inzGUrjhufALKPQAuPflJALLwzwmR5m/YxJmT2symi+YIMeQ== X-Received: by 2002:a05:6512:21a6:b0:48d:13c4:df1f with SMTP id c6-20020a05651221a600b0048d13c4df1fmr2151780lft.576.1660897947484; Fri, 19 Aug 2022 01:32:27 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:27 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 10/16] arm64: dts: qcom: sdm845: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:32:03 +0300 Message-Id: <20220819083209.50844-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index f0e286715d1b..21ed14200986 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -2590,7 +2590,12 @@ ipa: ipa@1e40000 { tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; - reg = <0 0x01f40000 0 0x40000>; + reg = <0 0x01f40000 0 0x20000>; + }; + + tcsr_regs_1: sycon@1f60000 { + compatible = "qcom,sdm845-tcsr", "syscon"; + reg = <0 0x01f60000 0 0x20000>; }; tlmm: pinctrl@3400000 { @@ -3207,7 +3212,7 @@ mss_pil: remoteproc@4080000 { <&pdc_reset PDC_MODEM_SYNC_RESET>; reset-names = "mss_restart", "pdc_reset"; - qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>; + qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>; power-domains = <&rpmhpd SDM845_CX>, <&rpmhpd SDM845_MX>, From patchwork Fri Aug 19 08:32: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: 598554 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 90142C32793 for ; Fri, 19 Aug 2022 08:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347619AbiHSIcs (ORCPT ); Fri, 19 Aug 2022 04:32:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347645AbiHSIcn (ORCPT ); Fri, 19 Aug 2022 04:32:43 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852FBE9A9C for ; Fri, 19 Aug 2022 01:32:30 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id v10so3865580ljh.9 for ; Fri, 19 Aug 2022 01:32: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=ccVNEGUyoLcQaI8UdynUDOxJeKEsV/fbBjw/mDhwVlQ=; b=YeBXMKhczh3OUm5tRZmsWzu8W6h3U6BxytA9zHgyzijvmxaYWMNcbpDU6cFzzneNzV cWYinBJR47zs1M8BfncTWEBA8YqxeephXrgGUSgog3pDfarqxPfK3UwdxQsVZaoWrRuU xXPWCbVDulY4BNgr2h5phO5izQMv9BSdNWz3ca9lcR+1LC9ydglzveCp5iujqYwF4EKo K9lpLtCQE5OcPLRRAitBEUwNu0RpiZEh/I42yFer4LUxmetZcADGEDlCI8YGM3Vke266 1pKHbXgESX7ywcxnee/v9WX7En3WC7PoxvAREIA1vXBELwfeTBGQHC9rtzyo282atoAf z95w== 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=ccVNEGUyoLcQaI8UdynUDOxJeKEsV/fbBjw/mDhwVlQ=; b=qBZ7VpJMg5qscePUrm9wgwk6cBsHGKGbfsLe0oAGD3+OQcL2nrj/df5omO79U9AMFM +2FKgaGLlIGGSMQQAAxHgU+FaGQRozVUcE895Pe87DXuYEBdf+j05ef4SNx2ETldVdSe hM0LdzusSBVkQunUVPgkAYFwU65TWwq1qUSk1NS42pFozLvHXeJs7d2tRhrw+FaEK2AZ flaeOrIZt70w+RIjiJ0XuN7J0WROKgtmuVeNqDdtUpxtXQk1yMdt44Kj5T4W38uhMNxJ s5jAWKpWY7kyMwFylPoVQGk20K6nur/FxJycfN3d3bKVStQSjwvSwkG97seSdzH+Rt/w 9GcA== X-Gm-Message-State: ACgBeo3WBus2WYuHv/vI98KxKxeR6N3cZmSrpw1wKOQy8/jmWcIsXSq/ egX6IoN1B5e/4iQFt/SX0OxRvQ== X-Google-Smtp-Source: AA6agR7qqaBvWZNiZs3HGRYQ2Gh7LZMn4wZs4cz/1KhQKcIsqoikGcj0ftgaNfEvhDVKdsoEH9jiFA== X-Received: by 2002:a2e:9254:0:b0:25e:4f20:8d3a with SMTP id v20-20020a2e9254000000b0025e4f208d3amr2018059ljg.233.1660897948918; Fri, 19 Aug 2022 01:32:28 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:28 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 11/16] arm64: dts: qcom: sdm845: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:32:04 +0300 Message-Id: <20220819083209.50844-12-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/sdm845-shift-axolotl.dtb: hwlock: 'reg' is a required property qcom/sdm845-shift-axolotl.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 21ed14200986..bd0ec0664283 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -919,12 +919,6 @@ compute-cb@8 { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - smp2p-cdsp { compatible = "qcom,smp2p"; qcom,smem = <94>, <432>; @@ -2588,9 +2582,10 @@ ipa: ipa@1e40000 { status = "disabled"; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0 0x01f40000 0 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 { From patchwork Fri Aug 19 08:32: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: 598764 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 83A3DC32771 for ; Fri, 19 Aug 2022 08:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347645AbiHSIct (ORCPT ); Fri, 19 Aug 2022 04:32:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347542AbiHSIcn (ORCPT ); Fri, 19 Aug 2022 04:32:43 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B1AE9A87 for ; Fri, 19 Aug 2022 01:32:31 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id b38so2614003lfv.4 for ; Fri, 19 Aug 2022 01:32: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=nR+TfTCxfwnZ0rpriGE1cYNwcjlY22/4IV6KiuLJyUA=; b=qWxpF6hFApW+kugscYVZOXUTnHoiBN8s32bAEQQdloNlE2m/km+jumHc9TS+vUlDEb R380ExFQFz7T3W23cCMPgQ+iH4vPNAMTredFdX9PcQDEfaT7t9990KPNJehOwHbqj12t HQabq9i8SDjuwwh9rw6yAJjtmcR4qMdmIC5N5fbH00cxQhmk9lGIOZ8UEZyaGWLuGwYL QTkNl+Nmd2dGzeTnXGZts8vWADoph1oMiXF02LAKcZxl/31vJ3nsYwsVYOH+8TO2drEr +CFr/WtZXya4le2wVu7FLKqhi315bTmUwbmtVAcJR/Dlh/e6iTO6JOVOJw5/0FHZVlrA K2xA== 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=nR+TfTCxfwnZ0rpriGE1cYNwcjlY22/4IV6KiuLJyUA=; b=coIJ/xAIzV4B34+VQVslE/ivjLHjkuHNlEfO0vf4OTzhxbk4MiMOc02tFaqVCZn29k P+cbF8enj5a82SnGDL07eJYkJyvH6qXskxUcRguVUav2HsupI6cJV5UagOFd0A2//YCI +3PXB0mFhHgv/lBJlrj09sQfvJ7wbEkzUR5sTSaPbZWEYZjtUbHpMP8T0TquQVedGNib NapQH9cATf6SOQ3arCUEd4knf2ShslwB0DJbbwvNMjMoe4UKrAFZaGb7cq0doSYbsYao Lo4jijV+1VR5oEA7lU67ewMV1wlVI1P8CvOXj/VJGBURr7xsJWbUbCK7pzVdRZ7/IFBa 7eEQ== X-Gm-Message-State: ACgBeo3mCIl/ATUnqVaI9LHr5GbFypgYGA5wMuJxmoHg4tOhCLicPzfG 4aqhXxuO16zPx4FsFbd/sojDNw== X-Google-Smtp-Source: AA6agR4K4pT+dAmoviSKHdNtbVIjG/ib3kJ7FVBQIXjODSWNhzjCrASZVBi9CHFQilZWCaeXGrKxmA== X-Received: by 2002:a05:6512:e99:b0:492:cf19:875 with SMTP id bi25-20020a0565120e9900b00492cf190875mr92408lfb.690.1660897950192; Fri, 19 Aug 2022 01:32:30 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:29 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 12/16] arm64: dts: qcom: qcs404: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:32:05 +0300 Message-Id: <20220819083209.50844-13-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/qcs404-evb-4000.dtb: hwlock: 'reg' is a required property qcom/qcs404-evb-4000.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/qcs404.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 9ab990061522..3a94eb2cc448 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -295,12 +295,6 @@ smem { hwlocks = <&tcsr_mutex 3>; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - soc: soc@0 { #address-cells = <1>; #size-cells = <1>; @@ -726,9 +720,10 @@ gcc: clock-controller@1800000 { assigned-clock-rates = <19200000>; }; - tcsr_mutex_regs: syscon@1905000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1905000 { + compatible = "qcom,tcsr-mutex"; reg = <0x01905000 0x20000>; + #hwlock-cells = <1>; }; tcsr: syscon@1937000 { From patchwork Fri Aug 19 08:32: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: 598553 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 A9447C3F6B0 for ; Fri, 19 Aug 2022 08:32:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347542AbiHSIcu (ORCPT ); Fri, 19 Aug 2022 04:32:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347650AbiHSIcn (ORCPT ); Fri, 19 Aug 2022 04:32:43 -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 E62BAE9AA8 for ; Fri, 19 Aug 2022 01:32:31 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id u9so5196158lfg.11 for ; Fri, 19 Aug 2022 01:32: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=+kinn7FouMNpw/yKeKaQATpcIgCOeso1VYgBKDbxVYo=; b=RKXxm+SDvm6sTqNszupfoIxaFYIrwkDEug0oB549p3/EqwD2n6PQ78FLDNtdCf7Vsx bE8bYf47YP7rsQT9ixmS0v4FEI07qlBaJfWCi0GkDRZWoafSebX3KbQ01N6bSNpIPY2U 6103pvlb+gsnIu8Go516RXltyk9PgAx92etxTsEVpxVgTG3QrzHjiLBB8LO1O2MLtGCf gIyt/IiNQNyuOfeaG932bihxCoSGmPqDDwhTzFU8iCS7aDu1OcwrfGHxabeqZgdjLaAD pJxtBZ/DDaeGS3fgIZdrbjGGwnGLV7oioWVPZPvVX3k7j16qxrWaFSbOSiHYU+Mn1NAK wXKw== 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=+kinn7FouMNpw/yKeKaQATpcIgCOeso1VYgBKDbxVYo=; b=nxcFFNnEr0XDZWOgQp+jWcotzGehREAbEUrLDLvb2jkLszvgxA2gUvQk2Gem/YNZDU voShCJFo4GXSKXiL0EvTpFuM1+KqoEntewtMK1BsrWRdjGs09C0mpzImomjdpOJ7/8HC Pw9a0m46tOy5IErY/7ahW+7WmbuyINYP7f+/zA53GWJZuTJCpeRA0Op6wutUQlPOb2cg zLZKB/oQ9Gg6PmoEOry30uv+nzhG+DTaUS4tGJZVwVhrYphTlrRkMZNjxL1cDOA6RYic Qi3r7rhhcHBM5fUAzeS/K9yzjWCQ8Ngf2fU8J3+MKh96JEwGWZ8hntBbwNh3UuWe3213 zkWw== X-Gm-Message-State: ACgBeo2aRTUTzgyRGrYYstN86hCyFQzWf96ZyTODQoWACXncSrFba1yT LIVOrmi5X6RgYAi+AS1N18VfDQ== X-Google-Smtp-Source: AA6agR4CLMLtr/xKoBlXz1v1rcyLD+1DC3Zg/+CkiI0xDB8n0AYOii5VQNkb2YO578SOgaaXHVnYXA== X-Received: by 2002:a05:6512:280f:b0:48d:81c:27de with SMTP id cf15-20020a056512280f00b0048d081c27demr2141319lfb.378.1660897951498; Fri, 19 Aug 2022 01:32:31 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:31 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 13/16] arm64: dts: qcom: sdm630: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:32:06 +0300 Message-Id: <20220819083209.50844-14-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v2: 1. New patch --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 1bc9091cad2a..a4f73be3d60a 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -699,7 +699,12 @@ tsens: thermal-sensor@10ae000 { tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; - reg = <0x01f40000 0x40000>; + reg = <0x01f40000 0x20000>; + }; + + tcsr_regs_1: sycon@1f60000 { + compatible = "qcom,sdm630-tcsr", "syscon"; + reg = <0x01f60000 0x20000>; }; tlmm: pinctrl@3100000 { From patchwork Fri Aug 19 08:32: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: 598763 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 22B90C3F6B0 for ; Fri, 19 Aug 2022 08:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347218AbiHSIc4 (ORCPT ); Fri, 19 Aug 2022 04:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347665AbiHSIco (ORCPT ); Fri, 19 Aug 2022 04:32:44 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B991E9AAD for ; Fri, 19 Aug 2022 01:32:33 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id a7so181957ljr.1 for ; Fri, 19 Aug 2022 01:32:33 -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=HUb81+JEG6Xfm8piVDwL1AMOuxmRGVBYXMDhN0hd0ms=; b=rYqOxrMR0a43Wuh/jdIepeZapi1JH23fopQiltPNP2wyBw5Imbcp6XyhQ0g8ZKzu0e Fc/5pkNrZMinq05pftWxFxF23KP/ZQZkqtNSEYAQN0v6m3q1bO8L0TxoaJt//06BWOdb PAH52qj9Po5SQ+7G//uBQ2h01WvPv3vRIxvAXwPSBUgPUYLzNb2/YSmogTyKRQKDdHVa KUviwKlqHP7dGGM7Lu/FZPsiWb5RFd+ZX90OeJaiUQ0wYWj/b4j309WYi6atoI2/AWFg o4gWzHU4Hh24juderxgFKmusH4ZxQlqRj+yM2k/tflM21i23/xIsQZmBkLpJgBa80yXL 753Q== 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=HUb81+JEG6Xfm8piVDwL1AMOuxmRGVBYXMDhN0hd0ms=; b=VwwAW2wJHr9IBr+FjrbMBRqYMKcJ5IC/v6zkO0OTTmY13jYDEpWKhjkCmqJv/kdxGw PVJMYW1LYyXCVj5n008VPjuplsjyEvEXqCoCoX3idKrY8NgzCP3sXEBYhWjOvFLxGmUu AaIGdaoQEtcgpaIs40N5jA1NoPk69C1Eu5k80W1dqBo0ofxF081cNCxZEiksGSwaIk7z T3E4xubOs4w9xh5eV7765G4YiQuqHSjK6mqHEs3NQMqMUc4eT91aVfLPkRRJ6u2SU+9Y EQGMp2Zg74gXB+f9hvhLENApUH4+wrLB/xiN5aL/nXpmwFRdQHU99Mhukgk2Wuv7BK87 2BAg== X-Gm-Message-State: ACgBeo1GAhA7SNy0JE4BYrMwzrF6ZJ5+bksNxd8qC8WM/hSVILPa2ysI dSyBBObq06wnNNEtcvXC2ovRgw== X-Google-Smtp-Source: AA6agR7zfGoVmGIWmhB1UGGA3KQnBfEKQNYXqcnoAuy4DHb0Gpt5hHDIJV17efLJKrHd7A1oUfbuuA== X-Received: by 2002:a2e:8515:0:b0:25e:5582:388f with SMTP id j21-20020a2e8515000000b0025e5582388fmr1730529lji.261.1660897952818; Fri, 19 Aug 2022 01:32:32 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:32 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 14/16] arm64: dts: qcom: sdm630: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:32:07 +0300 Message-Id: <20220819083209.50844-15-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/sdm636-sony-xperia-ganges-mermaid.dtb: hwlock: 'reg' is a required property qcom/sdm636-sony-xperia-ganges-mermaid.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index a4f73be3d60a..9ae6610af93a 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -697,9 +697,10 @@ tsens: thermal-sensor@10ae000 { #thermal-sensor-cells = <1>; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0x01f40000 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 { @@ -2356,12 +2357,6 @@ intc: interrupt-controller@17a00000 { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - sound: sound { }; From patchwork Fri Aug 19 08:32: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: 598552 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 34AABC28B2B for ; Fri, 19 Aug 2022 08:32:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347728AbiHSIc5 (ORCPT ); Fri, 19 Aug 2022 04:32:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347666AbiHSIco (ORCPT ); Fri, 19 Aug 2022 04:32:44 -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 98F26E9AB2 for ; Fri, 19 Aug 2022 01:32:34 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id n24so1843435ljc.13 for ; Fri, 19 Aug 2022 01:32: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=aF1kTOExhxJ5LhZnkigAMIE3Og/cjDqIZ0JV+mWnMgg=; b=b8DvidfLi+K7kGfFf1QKaFrYO7KrGRMn+DztPWASn5wxp41FkPsFAXyRdYxKfIX11u GWPaDRM6Ixd6HlnXMvoRoWVtci6X+Q3IYfN2DWV/JC9oS6rX2iSXMDTQryjBUEy7sdTT 7ce5dhSca/eP1c1D7KUM1Nouy/Jy0O6Tpde6tKMmDMj3PBeWG3ZmeNMStQKKLPiEXj5E 4xisLrl0TF+6DNAbedEleTix4fT9XfidVwuUpmmZV5z/VhQ5Qs34ERijU1/yPLEq7olh 6/hK/K+DPjdamhDvVsURSPMxZ49IMPt73IkXrufDz17b1jidI8awrDP8RY0ttx19Mz0O lI2A== 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=aF1kTOExhxJ5LhZnkigAMIE3Og/cjDqIZ0JV+mWnMgg=; b=04lAzHnkIhvDg28w8FYxV+q8EvaI4okbxfe5SpPq9ajOTyJP6gZC4rcYoC6UkaOXWh FWRYt2cdS+Z6/3vvUu94B+x0ERbwAqXAEdX+HxMOxlY0NVdg6i6SC/WUNKU+wM/V94Ea bMX9SiYzabYIzMfjMNfrfhwrrATsWlDxQ3hROowbs3ajGOieLgYaRhWrFH16D+IKgu7z NbSkgroaGju9sxsT3JtNq6h3ps8HzRc8r5gwkIPtPTEVJoJzEXAfaO76cXCL6pv0yimu Z6oDMQi82w+GBFX/aTjwMS8i6FWnPtAD1yzmIQ6H7lZ8uwpB++F8migydvPHHbUwh/d7 YZYQ== X-Gm-Message-State: ACgBeo0jXqDTEOCKEo9hryKw6SEBI8EuhfZe8OIGQ4DJs0l5ZukwTxP9 wEDg08+05GSWF5ttap4voDwuYg== X-Google-Smtp-Source: AA6agR6XRfFnswT27eivG55n2X6GuJgt/JHyayGyQW+0bgLjG2m6ACmKTArmnrpY8QmOaX0Z/3vO8A== X-Received: by 2002:a05:651c:514:b0:25e:7113:396b with SMTP id o20-20020a05651c051400b0025e7113396bmr1737625ljp.65.1660897954103; Fri, 19 Aug 2022 01:32:34 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:33 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 15/16] arm64: dts: qcom: sm8150: split TCSR halt regs out of mutex Date: Fri, 19 Aug 2022 11:32:08 +0300 Message-Id: <20220819083209.50844-16-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The TCSR halt regs are next to TCSR mutex (in one address block called 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v2: 1. New patch --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 7d509ecd44da..6df2e6828282 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -2056,7 +2056,12 @@ ipa_virt: interconnect@1e00000 { tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; - reg = <0x0 0x01f40000 0x0 0x40000>; + reg = <0x0 0x01f40000 0x0 0x20000>; + }; + + tcsr_regs_1: sycon@1f60000 { + compatible = "qcom,sm8150-tcsr", "syscon"; + reg = <0x0 0x01f60000 0x0 0x20000>; }; remoteproc_slpi: remoteproc@2400000 { From patchwork Fri Aug 19 08:32: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: 598762 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 59317C32771 for ; Fri, 19 Aug 2022 08:33:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347730AbiHSIc6 (ORCPT ); Fri, 19 Aug 2022 04:32:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347676AbiHSIcp (ORCPT ); Fri, 19 Aug 2022 04:32:45 -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 D722DE9AB8 for ; Fri, 19 Aug 2022 01:32:35 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id i19so5211380lfr.10 for ; Fri, 19 Aug 2022 01:32:35 -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=kO40mQ5LLiZM72PI1BOZaM3hZEnsq6qb9gCyjdGLi8E=; b=g1vh6m10ovfpwnHEpYd5bleuB3ieTl0HlOZy9kcgToeIlnHokH2a6h36qB/Bz7bqtY rnjOjsJydffU24SgMyQLzR+6ldMGAEFkIrt4kJVVujYzUHiP3VOC6HAY7nebnULJnFDn IlL06PdoFY1GpUlxMT0UqPrQD3SE9lB97QmIoTP3GIMcseDK6XXBjqYnW9ogMstg9IjA gcdesJFbkkrDkbKEL7KrXrhIn7XO+3SSWFRIUoCNwWukhk2aOe7Tq56YEhN+66aHASN4 6joodtqmahp03Bw+KMQvjvkLNs7kHDbFhp/YdfaIH0+uvRnkuXamKGbsmvju7zj8J6Cz +PKw== 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=kO40mQ5LLiZM72PI1BOZaM3hZEnsq6qb9gCyjdGLi8E=; b=1rzKYYqfYAvx7EYxx4NyjfVScIXo2ccI/I2mEzT4nwex7VlDFnLp7VnbIyC0NAKHA4 WpMcMCo9hBsXWLleorxPYCD2AZPPe4T4yMZPh5wxDXVOEJyd+9hwFEqI3AWAMfx6Yg3+ 46x//OkjSunEGSsmux896yF+HQiW/Y63cGxH7SUJAuJh89aGLlgktXK6thPAMVVQUQv+ LRjAqGQ1Q4NplOe+gVBNhhk7oNYXOc8xksjIMOnTYTZQJV/tzTe44j8YslQCbPIcStTV bYaf2cQeH9UhkNzYPKSk9KhEIG+fkuXCYnCz6VVqMGQUReTlMVMW17Qi1t5IDXMzJ4AU uQPQ== X-Gm-Message-State: ACgBeo2oXzxqp6++zRk9w2a2kizi+T4Q+RkdIktMrBm3JMIR10BySYm0 nzm1zuuN8xlF5u/bEGAZWlSy2A== X-Google-Smtp-Source: AA6agR7KumzH+lH7XCNHMJ0xX3epEUY1/e/6aC/dy4l7Gna3s4wt6/o6JpLuJTOao+IuaHNwqY2TGg== X-Received: by 2002:a05:6512:3090:b0:48b:6e1:1b55 with SMTP id z16-20020a056512309000b0048b06e11b55mr2325331lfd.535.1660897955437; Fri, 19 Aug 2022 01:32:35 -0700 (PDT) Received: from krzk-bin.. (d1xw6v77xrs23np8r6z-4.rev.dnainternet.fi. [2001:14bb:ac:e5a8:ef73:73ed:75b3:8ed5]) by smtp.gmail.com with ESMTPSA id j8-20020a19f508000000b00492a54f0be1sm545355lfb.284.2022.08.19.01.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:32:35 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH v3 16/16] arm64: dts: qcom: sm8150: switch TCSR mutex to MMIO Date: Fri, 19 Aug 2022 11:32:09 +0300 Message-Id: <20220819083209.50844-17-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> References: <20220819083209.50844-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/sm8150-mtp.dtb: hwlock: 'reg' is a required property qcom/sm8150-mtp.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 6df2e6828282..da737ba54490 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -585,12 +585,6 @@ scm: scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the size */ @@ -2054,9 +2048,10 @@ ipa_virt: interconnect@1e00000 { qcom,bcm-voters = <&apps_bcm_voter>; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0x0 0x01f40000 0x0 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 {