From patchwork Mon Jul 24 14:06:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705989 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 98992C41513 for ; Mon, 24 Jul 2023 14:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231451AbjGXOGj (ORCPT ); Mon, 24 Jul 2023 10:06:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231322AbjGXOGh (ORCPT ); Mon, 24 Jul 2023 10:06:37 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE95FE70 for ; Mon, 24 Jul 2023 07:06:35 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4fb960b7c9dso6682362e87.0 for ; Mon, 24 Jul 2023 07:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690207594; x=1690812394; 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=14RYrA+DRfRZwGnHOiBo6ifPBzeHttf2sq1Rsh4mMxk=; b=p0/i6H/phcRd2qdsCRj9GAHPvqYRPtlYVVBxq1dgP+4Q9LdSY7tCICgXT+Zso/oa1G g1UMR9jlgV9RHiDi/K9iTzpyjeLBx1N5S60BMRstkrbQr9Byz1+WC43sa/BjjVwXHK3e yGVMRh/GgXPLZUhjMljgW90KPC5uMqp/tC0zYUOaAr0pIVPOciX+QrBQUJ+nxPhdWb1x VIfm5F6ZjlVmK075fKO1vypsHQmz1Nah/0/Zq9yAx11gTh+pw2WuCvuMFZnKhmlJrWFh vDoLNogtWywQaFtiKriNQKfOvbXWJH+6nbhmBfoQjguyMg/BQH6lZ32w7BRHUfvnuext OZEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690207594; x=1690812394; 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=14RYrA+DRfRZwGnHOiBo6ifPBzeHttf2sq1Rsh4mMxk=; b=DqSiYFRCpMguf2/W8UniIXYkp9EYQiRp+clegr5nIu/W/kcsOHJGAQ65vsivOk9gF4 G+GlYanZTRr58gduCUvDtoTtENaWLj36hJmX+Shua2RJPzXSOFIiNBBena5q0lBBZdwl Gbvv7lk5F0IBtKrK/KnKpS2lmUoG19vOHWS90udH2FbCM8DKHW093fQLUu9+hBfcpFke 8Zy3pgi8ktfnyY92O4rq5lpMR8sBxsPtq/B2x+58wQEpF+GHNYXkhYc0e5jBUq0lqiUb tQPcs0L8Gol1xiZDxlRhyz16nZDbGjiiAuacX5BoBogZ6psCfDEyjA4HWmUBmX5sZbIq enMQ== X-Gm-Message-State: ABy/qLZdflII2e09aWVhYuxevKOuVLc2HAro9EF2BC33XCFITcCK5GMo y11UzVpsWEkms4wwUadvM0Nzfg== X-Google-Smtp-Source: APBJJlHIBg0VThBi3/p2NGTTvra/Qh5ebG0HFSU5uDIOF4a/++1Yz8fOLXgtfGnu/M7P/h38syshkQ== X-Received: by 2002:a19:7708:0:b0:4fd:b223:92c with SMTP id s8-20020a197708000000b004fdb223092cmr4433046lfc.60.1690207593955; Mon, 24 Jul 2023 07:06:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:06:33 -0700 (PDT) From: Konrad Dybcio Date: Mon, 24 Jul 2023 16:06:29 +0200 Subject: [PATCH v2 3/7] dt-bindings: interconnect: qcom: Fix and separate out SDM660 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v2-3-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=5684; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Q3+njg77nmTQFCS6ZK0ldMDDkYg/P1OjNOZNfVV/stI=; b=8CAV+FSysiZniRcfnwoUSVbJhgjcvy3HrIAu82LTP2kT83Q1C850deI158UHMpyepyoBispll lneLZG2/l7pAIj8GOJ4suW0I0fErPyzeetQWQxMOzm9vj3/HLHHoQa7 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 SDM660 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 --- .../devicetree/bindings/interconnect/qcom,rpm.yaml | 40 -------- .../bindings/interconnect/qcom,sdm660.yaml | 108 +++++++++++++++++++++ 2 files changed, 108 insertions(+), 40 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 4f95d512012a..59895cca6a8c 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -37,12 +37,6 @@ properties: - qcom,qcs404-bimc - qcom,qcs404-pcnoc - qcom,qcs404-snoc - - qcom,sdm660-a2noc - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-mnoc - - qcom,sdm660-snoc '#interconnect-cells': description: | @@ -123,10 +117,6 @@ allOf: - qcom,qcs404-bimc - qcom,qcs404-pcnoc - qcom,qcs404-snoc - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-snoc then: properties: @@ -146,7 +136,6 @@ allOf: contains: enum: - qcom,msm8996-mnoc - - qcom,sdm660-mnoc then: properties: @@ -209,35 +198,6 @@ allOf: - description: Aggregate2 NoC UFS AXI Clock - description: UFS AXI Clock - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm660-a2noc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: ipa - - const: ufs_axi - - const: aggre2_ufs_axi - - const: aggre2_usb3_axi - - const: cfg_noc_usb2_axi - - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - - description: IPA Clock. - - description: UFS AXI Clock. - - description: Aggregate2 UFS AXI Clock. - - description: Aggregate2 USB3 AXI Clock. - - description: Config NoC USB2 AXI Clock. - - if: not: properties: diff --git a/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml b/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml new file mode 100644 index 000000000000..8f6bc6399626 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml @@ -0,0 +1,108 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,sdm660.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SDM660 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm SDM660 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +properties: + compatible: + enum: + - qcom,sdm660-a2noc + - qcom,sdm660-bimc + - qcom,sdm660-cnoc + - qcom,sdm660-gnoc + - qcom,sdm660-mnoc + - qcom,sdm660-snoc + + reg: + maxItems: 1 + + clock-names: + minItems: 1 + maxItems: 5 + + clocks: + minItems: 1 + maxItems: 5 + +required: + - compatible + - reg + +unevaluatedProperties: false + +allOf: + - $ref: qcom,rpm-common.yaml# + - if: + properties: + compatible: + const: qcom,sdm660-mnoc + + then: + properties: + clocks: + items: + - description: CPU-NoC High-performance Bus Clock. + + clock-names: + const: iface + + - if: + properties: + compatible: + const: qcom,sdm660-a2noc + + then: + properties: + clocks: + items: + - description: IPA Clock. + - description: UFS AXI Clock. + - description: Aggregate2 UFS AXI Clock. + - description: Aggregate2 USB3 AXI Clock. + - description: Config NoC USB2 AXI Clock. + + clock-names: + items: + - const: ipa + - const: ufs_axi + - const: aggre2_ufs_axi + - const: aggre2_usb3_axi + - const: cfg_noc_usb2_axi + +examples: + - | + #include + #include + #include + + bimc: interconnect@1008000 { + compatible = "qcom,sdm660-bimc"; + reg = <0x01008000 0x78000>; + #interconnect-cells = <1>; + }; + + a2noc: interconnect@1704000 { + compatible = "qcom,sdm660-a2noc"; + reg = <0x01704000 0xc100>; + #interconnect-cells = <1>; + clocks = <&rpmcc RPM_SMD_IPA_CLK>, + <&gcc GCC_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_USB3_AXI_CLK>, + <&gcc GCC_CFG_NOC_USB2_AXI_CLK>; + clock-names = "ipa", + "ufs_axi", + "aggre2_ufs_axi", + "aggre2_usb3_axi", + "cfg_noc_usb2_axi"; + };