From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0557EC4332F for ; Thu, 21 Oct 2021 13:24:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D8779610CB for ; Thu, 21 Oct 2021 13:24:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbhJUN0v (ORCPT ); Thu, 21 Oct 2021 09:26:51 -0400 Received: from mail-40135.protonmail.ch ([185.70.40.135]:30910 "EHLO mail-40135.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbhJUN0v (ORCPT ); Thu, 21 Oct 2021 09:26:51 -0400 Date: Thu, 21 Oct 2021 13:24:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1634822672; bh=AfVYCFQdKCdmFWj4WldBvSqi3zgq359IaRLBqHgjcMU=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=cEyCi8NcgZdYJYR7tvs+1JCw1QNFNL73FGO9VXTrH4zuXbVhO7XQyOcH2WJc8gDn1 uYlswACrd9v1Rp7kP3feMME+qVmNcast44TK+hFN8Bw5xAgHZAtMJLy/IZtjsFHigr IVcSetBI1ufHek8LSUGQ9BEmm+d7wyzPjNuM6e4o= To: Georgi Djakov , Andy Gross , Bjorn Andersson , Rob Herring From: Yassine Oudjana Cc: Yassine Oudjana , Dmitry Baryshkov , AngeloGioacchino Del Regno , Marijn Suijten , Konrad Dybcio , Shawn Guo , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Reply-To: Yassine Oudjana Subject: [PATCH RESEND v5 1/5] dt-bindings: interconnect: Combine SDM660 bindings into RPM schema Message-ID: <20211021132329.234942-2-y.oudjana@protonmail.com> In-Reply-To: <20211021132329.234942-1-y.oudjana@protonmail.com> References: <20211021132329.234942-1-y.oudjana@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SDM660 interconnect bindings are similar to other RPM interconnect providers, and now it shares the same common driver with them, so it is better to combine them into qcom,rpm.yaml. Signed-off-by: Yassine Oudjana --- .../bindings/interconnect/qcom,rpm.yaml | 103 +++++++++- .../bindings/interconnect/qcom,sdm660.yaml | 185 ------------------ 2 files changed, 95 insertions(+), 193 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm= 660.yaml diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b= /Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 983d71fb5399..6c39c0529e36 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -30,19 +30,23 @@ 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 =20 '#interconnect-cells': const: 1 =20 - clock-names: - items: - - const: bus - - const: bus_a - clocks: - items: - - description: Bus Clock - - description: Bus A Clock + minItems: 2 + maxItems: 7 + + clock-names: + minItems: 2 + maxItems: 7 =20 required: - compatible @@ -53,6 +57,89 @@ required: =20 additionalProperties: false =20 +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8916-bimc + - qcom,msm8916-pcnoc + - qcom,msm8916-snoc + - qcom,msm8939-bimc + - qcom,msm8939-pcnoc + - qcom,msm8939-snoc + - qcom,msm8939-snoc-mm + - qcom,qcs404-bimc + - qcom,qcs404-pcnoc + - qcom,qcs404-snoc + - qcom,sdm660-bimc + - qcom,sdm660-cnoc + - qcom,sdm660-gnoc + - qcom,sdm660-snoc + + then: + properties: + clock-names: + items: + - const: bus + - const: bus_a + + clocks: + items: + - description: Bus Clock + - description: Bus A Clock + + - if: + properties: + compatible: + contains: + enum: + - qcom,sdm660-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,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. + examples: - | #include diff --git a/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yam= l b/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml deleted file mode 100644 index bcd41e491f1d..000000000000 --- a/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml +++ /dev/null @@ -1,185 +0,0 @@ -# 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: - - AngeloGioacchino Del Regno - -description: | - The Qualcomm SDM660 interconnect providers support adjusting the - bandwidth requirements between the various NoC fabrics. - -properties: - reg: - maxItems: 1 - - compatible: - enum: - - qcom,sdm660-a2noc - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-mnoc - - qcom,sdm660-snoc - - '#interconnect-cells': - const: 1 - - clocks: - minItems: 1 - maxItems: 7 - - clock-names: - minItems: 1 - maxItems: 7 - -required: - - compatible - - reg - - '#interconnect-cells' - - clock-names - - clocks - -additionalProperties: false - -allOf: - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm660-mnoc - then: - properties: - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - - description: CPU-NoC High-performance Bus Clock. - clock-names: - items: - - const: bus - - const: bus_a - - const: iface - - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm660-a2noc - then: - properties: - 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. - 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 - - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-snoc - then: - properties: - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - clock-names: - items: - - const: bus - - const: bus_a - -examples: - - | - #include - #include - #include - - bimc: interconnect@1008000 { - compatible =3D "qcom,sdm660-bimc"; - reg =3D <0x01008000 0x78000>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", "bus_a"; - clocks =3D <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; - }; - - cnoc: interconnect@1500000 { - compatible =3D "qcom,sdm660-cnoc"; - reg =3D <0x01500000 0x10000>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", "bus_a"; - clocks =3D <&rpmcc RPM_SMD_CNOC_CLK>, - <&rpmcc RPM_SMD_CNOC_A_CLK>; - }; - - snoc: interconnect@1626000 { - compatible =3D "qcom,sdm660-snoc"; - reg =3D <0x01626000 0x7090>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", "bus_a"; - clocks =3D <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; - }; - - a2noc: interconnect@1704000 { - compatible =3D "qcom,sdm660-a2noc"; - reg =3D <0x01704000 0xc100>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", - "bus_a", - "ipa", - "ufs_axi", - "aggre2_ufs_axi", - "aggre2_usb3_axi", - "cfg_noc_usb2_axi"; - clocks =3D <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, - <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>, - <&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>; - }; - - mnoc: interconnect@1745000 { - compatible =3D "qcom,sdm660-mnoc"; - reg =3D <0x01745000 0xa010>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", "bus_a", "iface"; - clocks =3D <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>, - <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK_A>, - <&mmcc AHB_CLK_SRC>; - }; - - gnoc: interconnect@17900000 { - compatible =3D "qcom,sdm660-gnoc"; - reg =3D <0x17900000 0xe000>; - #interconnect-cells =3D <1>; - clock-names =3D "bus", "bus_a"; - clocks =3D <&xo_board>, <&xo_board>; - }; --=20 2.33.1