Commit b9544fb5 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-sdm670' into icc-next 

* icc-sdm670
  dt-bindings: interconnect: add sdm670 interconnects
  interconnect: qcom: add sdm670 interconnects

Link: https://lore.kernel.org/r/20230111005155.50452-1-mailingradian@gmail.com


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents 863ed40e 7e438e18

Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

+2 −0
Original line number Diff line number Diff line
@@ -27,11 +27,13 @@ properties: 
              - qcom,sc7280-cpu-bwmon

              - qcom,sc8280xp-cpu-bwmon

              - qcom,sdm845-bwmon

              - qcom,sm8550-cpu-bwmon

          - const: qcom,msm8998-bwmon

      - const: qcom,msm8998-bwmon       # BWMON v4

      - items:

          - enum:

              - qcom,sc8280xp-llcc-bwmon

              - qcom,sm8550-llcc-bwmon

          - const: qcom,sc7280-llcc-bwmon

      - const: qcom,sc7280-llcc-bwmon   # BWMON v5

      - const: qcom,sdm845-llcc-bwmon   # BWMON v5

Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
              - qcom,sc7180-osm-l3

              - qcom,sc8180x-osm-l3

              - qcom,sdm845-osm-l3

              - qcom,sm6350-osm-l3

              - qcom,sm8150-osm-l3

          - const: qcom,osm-l3

      - items:

Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml

+8 −35
Original line number Diff line number Diff line
@@ -39,18 +39,6 @@ properties: 
      - qcom,sc7180-npu-noc

      - qcom,sc7180-qup-virt

      - qcom,sc7180-system-noc

      - qcom,sc7280-aggre1-noc

      - qcom,sc7280-aggre2-noc

      - qcom,sc7280-clk-virt

      - qcom,sc7280-cnoc2

      - qcom,sc7280-cnoc3

      - qcom,sc7280-dc-noc

      - qcom,sc7280-gem-noc

      - qcom,sc7280-lpass-ag-noc

      - qcom,sc7280-mc-virt

      - qcom,sc7280-mmss-noc

      - qcom,sc7280-nsp-noc

      - qcom,sc7280-system-noc

      - qcom,sc8180x-aggre1-noc

      - qcom,sc8180x-aggre2-noc

      - qcom,sc8180x-camnoc-virt
@@ -62,18 +50,14 @@ properties: 
      - qcom,sc8180x-mmss-noc

      - qcom,sc8180x-qup-virt

      - qcom,sc8180x-system-noc

      - qcom,sc8280xp-aggre1-noc

      - qcom,sc8280xp-aggre2-noc

      - qcom,sc8280xp-clk-virt

      - qcom,sc8280xp-config-noc

      - qcom,sc8280xp-dc-noc

      - qcom,sc8280xp-gem-noc

      - qcom,sc8280xp-lpass-ag-noc

      - qcom,sc8280xp-mc-virt

      - qcom,sc8280xp-mmss-noc

      - qcom,sc8280xp-nspa-noc

      - qcom,sc8280xp-nspb-noc

      - qcom,sc8280xp-system-noc

      - qcom,sdm670-aggre1-noc

      - qcom,sdm670-aggre2-noc

      - qcom,sdm670-config-noc

      - qcom,sdm670-dc-noc

      - qcom,sdm670-gladiator-noc

      - qcom,sdm670-mem-noc

      - qcom,sdm670-mmss-noc

      - qcom,sdm670-system-noc

      - qcom,sdm845-aggre1-noc

      - qcom,sdm845-aggre2-noc

      - qcom,sdm845-config-noc
@@ -118,17 +102,6 @@ properties: 
      - qcom,sm8350-mmss-noc

      - qcom,sm8350-compute-noc

      - qcom,sm8350-system-noc

      - qcom,sm8450-aggre1-noc

      - qcom,sm8450-aggre2-noc

      - qcom,sm8450-clk-virt

      - qcom,sm8450-config-noc

      - qcom,sm8450-gem-noc

      - qcom,sm8450-lpass-ag-noc

      - qcom,sm8450-mc-virt

      - qcom,sm8450-mmss-noc

      - qcom,sm8450-nsp-noc

      - qcom,sm8450-pcie-anoc

      - qcom,sm8450-system-noc



  '#interconnect-cells': true

Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml

0 → 100644
+71 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,sc7280-rpmh.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm RPMh Network-On-Chip Interconnect on SC7280



maintainers:

  - Bjorn Andersson <andersson@kernel.org>

  - Konrad Dybcio <konrad.dybcio@linaro.org>



description: |

  RPMh interconnect providers support system bandwidth requirements through

  RPMh hardware accelerators known as Bus Clock Manager (BCM).



  See also:: include/dt-bindings/interconnect/qcom,sc7280.h



properties:

  compatible:

    enum:

      - qcom,sc7280-aggre1-noc

      - qcom,sc7280-aggre2-noc

      - qcom,sc7280-clk-virt

      - qcom,sc7280-cnoc2

      - qcom,sc7280-cnoc3

      - qcom,sc7280-dc-noc

      - qcom,sc7280-gem-noc

      - qcom,sc7280-lpass-ag-noc

      - qcom,sc7280-mc-virt

      - qcom,sc7280-mmss-noc

      - qcom,sc7280-nsp-noc

      - qcom,sc7280-system-noc



  reg:

    maxItems: 1



required:

  - compatible



allOf:

  - $ref: qcom,rpmh-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc7280-clk-virt

    then:

      properties:

        reg: false

    else:

      required:

        - reg



unevaluatedProperties: false



examples:

  - |

    interconnect {

        compatible = "qcom,sc7280-clk-virt";

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };



    interconnect@9100000 {

        reg = <0x9100000 0xe2200>;

        compatible = "qcom,sc7280-gem-noc";

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };

Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,sc8280xp-rpmh.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm RPMh Network-On-Chip Interconnect on SC8280XP



maintainers:

  - Bjorn Andersson <andersson@kernel.org>

  - Konrad Dybcio <konrad.dybcio@linaro.org>



description: |

  RPMh interconnect providers support system bandwidth requirements through

  RPMh hardware accelerators known as Bus Clock Manager (BCM).



  See also:: include/dt-bindings/interconnect/qcom,sc8280xp.h



properties:

  compatible:

    enum:

      - qcom,sc8280xp-aggre1-noc

      - qcom,sc8280xp-aggre2-noc

      - qcom,sc8280xp-clk-virt

      - qcom,sc8280xp-config-noc

      - qcom,sc8280xp-dc-noc

      - qcom,sc8280xp-gem-noc

      - qcom,sc8280xp-lpass-ag-noc

      - qcom,sc8280xp-mc-virt

      - qcom,sc8280xp-mmss-noc

      - qcom,sc8280xp-nspa-noc

      - qcom,sc8280xp-nspb-noc

      - qcom,sc8280xp-system-noc



required:

  - compatible



allOf:

  - $ref: qcom,rpmh-common.yaml#



unevaluatedProperties: false



examples:

  - |

    interconnect-0 {

        compatible = "qcom,sc8280xp-aggre1-noc";

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };