From patchwork Mon Jul 24 14:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 706509 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 42666C41513 for ; Mon, 24 Jul 2023 14:06:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbjGXOGv (ORCPT ); Mon, 24 Jul 2023 10:06:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231434AbjGXOGi (ORCPT ); Mon, 24 Jul 2023 10:06:38 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A7AAE65 for ; Mon, 24 Jul 2023 07:06:37 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fdddf92b05so6245609e87.3 for ; Mon, 24 Jul 2023 07:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690207595; x=1690812395; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=DI3XSmWAQW8kVYbRI7HJqEcMWkjdmlEzkWOn/96mEgA=; b=Ott7X6Os1IoihehNSwApHp/wFXhfiWvlFOWLG7OGw/CMc4YMMfVZSGj39pFm/qPNNj BPlGbP65zcP7bezsKJnCrPLmadcmk4KyPEmi0PghS5PaAU826zdpuoO1n1C5/OBHKFOn ALJgrdglMRUT8VhGl7qGXB82WMnlMadvtxPh4zwDz4lAtO1t18mK6Z9VbHne8CkEeZjX I6FBGLVLu/NWHy8qNZ4pVCZn1hmWnqKBXGi3SeLECzmAVUgwWxWJWeRYgzpKiy+xrUiz fKH1pmGJ5HOf2Qd0iKlI/xAfMWf5DMb4d44VfHD/2G9RjU8l/0156T1zUeFd1E5UMPsA Wq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690207595; x=1690812395; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DI3XSmWAQW8kVYbRI7HJqEcMWkjdmlEzkWOn/96mEgA=; b=CdSGw04iyaMyUMvRJxWvGBTRmYHADVn+EcU8pds8SnUKB3aDsQzrXUR/OTtCGA94nU RxKuEO87jp5PRPA6nn+mP8CXw+750CPO3nhhyy6VCzwxlmgACJvFBDA9ggmKGGsvAHNE 1ZuUQKDZRJfJddxeqGbBDxrpQ4NJlGEvxjMdmbHB3KgV+py4ozWZm8v68+OcTWJ95anE hAa+1DUKs2Ct0Oqp55ab+o6i3tkVtETy6w4vQ9Hes56VTcGCBUgGJSTUm5iyvre9r8x4 VflRPnBe/O4gWmG2LcSmgVVoICRyFzKFPCO4TBWMuoy/kUPMhK5CqR2BEO+Jpv3F/P5n fnZw== X-Gm-Message-State: ABy/qLYH6lC4JhbLrmtyIJf5fmOqMabgsI8yRtwyzU0HzMCfSzHAwrxA kAUNTjRfsEV9FhGJtIOtc74HK2YbmxC7skNIW5gcZg== X-Google-Smtp-Source: APBJJlEhWyNGqyocM6AhI4dDvZ283TDQ98noWRDU/Sd8MeLvAMT4j5NoEl1+zxyMozTcufNiF0xkug== X-Received: by 2002:a05:6512:230e:b0:4fb:9e1a:e592 with SMTP id o14-20020a056512230e00b004fb9e1ae592mr6272439lfu.4.1690207595358; Mon, 24 Jul 2023 07:06:35 -0700 (PDT) Received: from [192.168.1.101] (abxj221.neoplus.adsl.tpnet.pl. [83.9.3.221]) by smtp.gmail.com with ESMTPSA id er26-20020a05651248da00b004fbab1f023csm2223481lfb.138.2023.07.24.07.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:06:35 -0700 (PDT) From: Konrad Dybcio Date: Mon, 24 Jul 2023 16:06:30 +0200 Subject: [PATCH v2 4/7] dt-bindings: interconnect: qcom: Fix and separate out MSM8996 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v2-4-e33d5acbf3bd@linaro.org> References: <20230721-topic-icc_bindings-v2-0-e33d5acbf3bd@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v2-0-e33d5acbf3bd@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1690207588; l=6848; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=QDEI6Sb98whTXz4RR85RkJ/E6rSVXmsPchXZMmzX0g8=; b=PO497tZUlELC9HCQFTcHw2KURjUPrTKa5kd5VuYKSpu7MwWA6OBtUMRshsDBTESHUmaZoOA/B X/llGnfOsDMAJEm63fuhESig7Th4B1SX5NvQbC0zhk+JYQWTfGJ37ov X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Separate out MSM8996 icc bindings from the common file and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8996.yaml | 126 +++++++++++++++++++++ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 81 ------------- 2 files changed, 126 insertions(+), 81 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml new file mode 100644 index 000000000000..e3f964aaad1b --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml @@ -0,0 +1,126 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,msm8996.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm MSM8996 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm MSM8996 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +properties: + compatible: + enum: + - qcom,msm8996-a0noc + - qcom,msm8996-a1noc + - qcom,msm8996-a2noc + - qcom,msm8996-bimc + - qcom,msm8996-cnoc + - qcom,msm8996-mnoc + - qcom,msm8996-pnoc + - qcom,msm8996-snoc + + reg: + maxItems: 1 + + clock-names: + minItems: 1 + maxItems: 3 + + clocks: + minItems: 1 + maxItems: 3 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +allOf: + - $ref: qcom,rpm-common.yaml# + - if: + properties: + compatible: + const: qcom,msm8996-a0noc + + then: + properties: + clocks: + items: + - description: Aggregate0 System NoC AXI Clock. + - description: Aggregate0 Config NoC AHB Clock. + - description: Aggregate0 NoC MPU Clock. + + clock-names: + items: + - const: aggre0_snoc_axi + - const: aggre0_cnoc_ahb + - const: aggre0_noc_mpu_cfg + + required: + - power-domains + + - if: + properties: + compatible: + const: qcom,msm8996-mnoc + + then: + properties: + clocks: + items: + - description: CPU-NoC High-performance Bus Clock. + + clock-names: + const: iface + + - if: + properties: + compatible: + const: qcom,msm8996-a2noc + + then: + properties: + clocks: + items: + - description: Aggregate2 NoC UFS AXI Clock + - description: UFS AXI Clock + + clock-names: + items: + - const: aggre2_ufs_axi + - const: ufs_axi + +examples: + - | + #include + #include + #include + + bimc: interconnect@408000 { + compatible = "qcom,msm8996-bimc"; + reg = <0x00408000 0x5a000>; + #interconnect-cells = <1>; + }; + + a0noc: interconnect@543000 { + compatible = "qcom,msm8996-a0noc"; + reg = <0x00543000 0x6000>; + #interconnect-cells = <1>; + clocks = <&gcc GCC_AGGRE0_SNOC_AXI_CLK>, + <&gcc GCC_AGGRE0_CNOC_AHB_CLK>, + <&gcc GCC_AGGRE0_NOC_MPU_CFG_AHB_CLK>; + clock-names = "aggre0_snoc_axi", + "aggre0_cnoc_ahb", + "aggre0_noc_mpu_cfg"; + power-domains = <&gcc AGGRE0_NOC_GDSC>; + }; diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 59895cca6a8c..3e1bcbbdb532 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -26,14 +26,6 @@ properties: - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc - - qcom,msm8996-a0noc - - qcom,msm8996-a1noc - - qcom,msm8996-a2noc - - qcom,msm8996-bimc - - qcom,msm8996-cnoc - - qcom,msm8996-mnoc - - qcom,msm8996-pnoc - - qcom,msm8996-snoc - qcom,qcs404-bimc - qcom,qcs404-pcnoc - qcom,qcs404-snoc @@ -109,11 +101,6 @@ allOf: - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc - - qcom,msm8996-a1noc - - qcom,msm8996-bimc - - qcom,msm8996-cnoc - - qcom,msm8996-pnoc - - qcom,msm8996-snoc - qcom,qcs404-bimc - qcom,qcs404-pcnoc - qcom,qcs404-snoc @@ -130,74 +117,6 @@ allOf: - description: Bus Clock - description: Bus A Clock - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-mnoc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: iface - - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - - description: CPU-NoC High-performance Bus Clock. - - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-a0noc - - then: - properties: - clock-names: - items: - - const: aggre0_snoc_axi - - const: aggre0_cnoc_ahb - - const: aggre0_noc_mpu_cfg - - clocks: - items: - - description: Aggregate0 System NoC AXI Clock. - - description: Aggregate0 Config NoC AHB Clock. - - description: Aggregate0 NoC MPU Clock. - - required: - - power-domains - - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-a2noc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: aggre2_ufs_axi - - const: ufs_axi - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - - description: Aggregate2 NoC UFS AXI Clock - - description: UFS AXI Clock - - if: not: properties: