| Message ID | 20200728023811.5607-2-jonathan@marek.ca (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add SM8150 and SM8250 interconnect drivers | expand |
On 2020-07-28 08:08, Jonathan Marek wrote: > These two bindings are almost identical, so combine them into one. This > will make it easier to add the sm8150 and sm8250 interconnect bindings. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> Reviewed-by: Sibi Sankar <sibis@codeaurora.org> > --- > .../{qcom,sdm845.yaml => qcom,rpmh.yaml} | 20 ++++- > .../bindings/interconnect/qcom,sc7180.yaml | 85 ------------------- > 2 files changed, 17 insertions(+), 88 deletions(-) > rename > Documentation/devicetree/bindings/interconnect/{qcom,sdm845.yaml => > qcom,rpmh.yaml} (76%) > delete mode 100644 > Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml > > diff --git > a/Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml > b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml > similarity index 76% > rename from > Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml > rename to Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml > index 74536747b51d..6a457f914bb5 100644 > --- a/Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml > +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml > @@ -1,16 +1,17 @@ > # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/interconnect/qcom,sdm845.yaml# > +$id: http://devicetree.org/schemas/interconnect/qcom,rpmh.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Qualcomm SDM845 Network-On-Chip Interconnect > +title: Qualcomm RPMh Network-On-Chip Interconnect > > maintainers: > - Georgi Djakov <georgi.djakov@linaro.org> > + - Odelu Kukatla <okukatla@codeaurora.org> > > description: | > - SDM845 interconnect providers support system bandwidth requirements > through > + RPMh interconnect providers support system bandwidth requirements > through > RPMh hardware accelerators known as Bus Clock Manager (BCM). The > provider is > able to communicate with the BCM through the Resource State > Coordinator (RSC) > associated with each execution environment. Provider nodes must > point to at > @@ -23,6 +24,19 @@ properties: > > compatible: > enum: > + - qcom,sc7180-aggre1-noc > + - qcom,sc7180-aggre2-noc > + - qcom,sc7180-camnoc-virt > + - qcom,sc7180-compute-noc > + - qcom,sc7180-config-noc > + - qcom,sc7180-dc-noc > + - qcom,sc7180-gem-noc > + - qcom,sc7180-ipa-virt > + - qcom,sc7180-mc-virt > + - qcom,sc7180-mmss-noc > + - qcom,sc7180-npu-noc > + - qcom,sc7180-qup-virt > + - qcom,sc7180-system-noc > - qcom,sdm845-aggre1-noc > - qcom,sdm845-aggre2-noc > - qcom,sdm845-config-noc > diff --git > a/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml > b/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml > deleted file mode 100644 > index d01bac80d416..000000000000 > --- a/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml > +++ /dev/null > @@ -1,85 +0,0 @@ > -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > -%YAML 1.2 > ---- > -$id: http://devicetree.org/schemas/interconnect/qcom,sc7180.yaml# > -$schema: http://devicetree.org/meta-schemas/core.yaml# > - > -title: Qualcomm SC7180 Network-On-Chip Interconnect > - > -maintainers: > - - Odelu Kukatla <okukatla@codeaurora.org> > - > -description: | > - SC7180 interconnect providers support system bandwidth requirements > through > - RPMh hardware accelerators known as Bus Clock Manager (BCM). The > provider is > - able to communicate with the BCM through the Resource State > Coordinator (RSC) > - associated with each execution environment. Provider nodes must > point to at > - least one RPMh device child node pertaining to their RSC and each > provider > - can map to multiple RPMh resources. > - > -properties: > - reg: > - maxItems: 1 > - > - compatible: > - enum: > - - qcom,sc7180-aggre1-noc > - - qcom,sc7180-aggre2-noc > - - qcom,sc7180-camnoc-virt > - - qcom,sc7180-compute-noc > - - qcom,sc7180-config-noc > - - qcom,sc7180-dc-noc > - - qcom,sc7180-gem-noc > - - qcom,sc7180-ipa-virt > - - qcom,sc7180-mc-virt > - - qcom,sc7180-mmss-noc > - - qcom,sc7180-npu-noc > - - qcom,sc7180-qup-virt > - - qcom,sc7180-system-noc > - > - '#interconnect-cells': > - const: 1 > - > - qcom,bcm-voters: > - $ref: /schemas/types.yaml#/definitions/phandle-array > - description: | > - List of phandles to qcom,bcm-voter nodes that are required by > - this interconnect to send RPMh commands. > - > - qcom,bcm-voter-names: > - $ref: /schemas/types.yaml#/definitions/string-array > - description: | > - Names for each of the qcom,bcm-voters specified. > - > -required: > - - compatible > - - reg > - - '#interconnect-cells' > - - qcom,bcm-voters > - > -additionalProperties: false > - > -examples: > - - | > - #include <dt-bindings/interconnect/qcom,sc7180.h> > - > - config_noc: interconnect@1500000 { > - compatible = "qcom,sc7180-config-noc"; > - reg = <0x01500000 0x28000>; > - #interconnect-cells = <1>; > - qcom,bcm-voters = <&apps_bcm_voter>; > - }; > - > - system_noc: interconnect@1620000 { > - compatible = "qcom,sc7180-system-noc"; > - reg = <0x01620000 0x17080>; > - #interconnect-cells = <1>; > - qcom,bcm-voters = <&apps_bcm_voter>; > - }; > - > - mmss_noc: interconnect@1740000 { > - compatible = "qcom,sc7180-mmss-noc"; > - reg = <0x01740000 0x1c100>; > - #interconnect-cells = <1>; > - qcom,bcm-voters = <&apps_bcm_voter>; > - };
On Mon, 27 Jul 2020 22:38:00 -0400, Jonathan Marek wrote: > These two bindings are almost identical, so combine them into one. This > will make it easier to add the sm8150 and sm8250 interconnect bindings. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > .../{qcom,sdm845.yaml => qcom,rpmh.yaml} | 20 ++++- > .../bindings/interconnect/qcom,sc7180.yaml | 85 ------------------- > 2 files changed, 17 insertions(+), 88 deletions(-) > rename Documentation/devicetree/bindings/interconnect/{qcom,sdm845.yaml => qcom,rpmh.yaml} (76%) > delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml similarity index 76% rename from Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml rename to Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml index 74536747b51d..6a457f914bb5 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml @@ -1,16 +1,17 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/interconnect/qcom,sdm845.yaml# +$id: http://devicetree.org/schemas/interconnect/qcom,rpmh.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm SDM845 Network-On-Chip Interconnect +title: Qualcomm RPMh Network-On-Chip Interconnect maintainers: - Georgi Djakov <georgi.djakov@linaro.org> + - Odelu Kukatla <okukatla@codeaurora.org> description: | - SDM845 interconnect providers support system bandwidth requirements through + RPMh interconnect providers support system bandwidth requirements through RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is able to communicate with the BCM through the Resource State Coordinator (RSC) associated with each execution environment. Provider nodes must point to at @@ -23,6 +24,19 @@ properties: compatible: enum: + - qcom,sc7180-aggre1-noc + - qcom,sc7180-aggre2-noc + - qcom,sc7180-camnoc-virt + - qcom,sc7180-compute-noc + - qcom,sc7180-config-noc + - qcom,sc7180-dc-noc + - qcom,sc7180-gem-noc + - qcom,sc7180-ipa-virt + - qcom,sc7180-mc-virt + - qcom,sc7180-mmss-noc + - qcom,sc7180-npu-noc + - qcom,sc7180-qup-virt + - qcom,sc7180-system-noc - qcom,sdm845-aggre1-noc - qcom,sdm845-aggre2-noc - qcom,sdm845-config-noc diff --git a/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml b/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml deleted file mode 100644 index d01bac80d416..000000000000 --- a/Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/interconnect/qcom,sc7180.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Qualcomm SC7180 Network-On-Chip Interconnect - -maintainers: - - Odelu Kukatla <okukatla@codeaurora.org> - -description: | - SC7180 interconnect providers support system bandwidth requirements through - RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is - able to communicate with the BCM through the Resource State Coordinator (RSC) - associated with each execution environment. Provider nodes must point to at - least one RPMh device child node pertaining to their RSC and each provider - can map to multiple RPMh resources. - -properties: - reg: - maxItems: 1 - - compatible: - enum: - - qcom,sc7180-aggre1-noc - - qcom,sc7180-aggre2-noc - - qcom,sc7180-camnoc-virt - - qcom,sc7180-compute-noc - - qcom,sc7180-config-noc - - qcom,sc7180-dc-noc - - qcom,sc7180-gem-noc - - qcom,sc7180-ipa-virt - - qcom,sc7180-mc-virt - - qcom,sc7180-mmss-noc - - qcom,sc7180-npu-noc - - qcom,sc7180-qup-virt - - qcom,sc7180-system-noc - - '#interconnect-cells': - const: 1 - - qcom,bcm-voters: - $ref: /schemas/types.yaml#/definitions/phandle-array - description: | - List of phandles to qcom,bcm-voter nodes that are required by - this interconnect to send RPMh commands. - - qcom,bcm-voter-names: - $ref: /schemas/types.yaml#/definitions/string-array - description: | - Names for each of the qcom,bcm-voters specified. - -required: - - compatible - - reg - - '#interconnect-cells' - - qcom,bcm-voters - -additionalProperties: false - -examples: - - | - #include <dt-bindings/interconnect/qcom,sc7180.h> - - config_noc: interconnect@1500000 { - compatible = "qcom,sc7180-config-noc"; - reg = <0x01500000 0x28000>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - - system_noc: interconnect@1620000 { - compatible = "qcom,sc7180-system-noc"; - reg = <0x01620000 0x17080>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - - mmss_noc: interconnect@1740000 { - compatible = "qcom,sc7180-mmss-noc"; - reg = <0x01740000 0x1c100>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - };
These two bindings are almost identical, so combine them into one. This will make it easier to add the sm8150 and sm8250 interconnect bindings. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- .../{qcom,sdm845.yaml => qcom,rpmh.yaml} | 20 ++++- .../bindings/interconnect/qcom,sc7180.yaml | 85 ------------------- 2 files changed, 17 insertions(+), 88 deletions(-) rename Documentation/devicetree/bindings/interconnect/{qcom,sdm845.yaml => qcom,rpmh.yaml} (76%) delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml