Commit 3b650100 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.3-rc1' of... 

Merge tag 'icc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-next

Georgi writes:

interconnect changes for 6.3

Here are the interconnect changes for the 6.3-rc1 merge window with the
significant part being new drivers.

Driver changes:
- New driver for Qualcomm SM8550
- New driver for Qualcomm QDU1000/QRU1000
- New driver for Qualcomm SDM670
- New driver for Qualcomm SA8775P
- Drop the IP0 interconnects and migrate them to RPMh clocks instead
- Misc improvements in the DT schema for some existing drivers

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc: (25 commits)
  dt-bindings: interconnect: samsung,exynos-bus: allow opp-table
  dt-bindings: interconnect: qcom,sa8775p-rpmh: fix a typo
  dt-bindings: interconnect: Exclude all non msm8939 from snoc-mm
  interconnect: qcom: add a driver for sa8775p
  dt-bindings: interconnect: qcom: document the interconnects for sa8775p
  interconnect: qcom: add sdm670 interconnects
  dt-bindings: interconnect: add sdm670 interconnects
  dt-bindings: interconnect: OSM L3: Add SM6350 OSM L3 compatible
  dt-bindings: interconnect: qcom-bwmon: document SM8550 compatibles
  dt-bindings: interconnect: split SM8450 to own schema
  dt-bindings: interconnect: split SC8280XP to own schema
  dt-bindings: interconnect: split SC7280 to own schema
  dt-bindings: interconnect: qcom: drop IPA_CORE related defines
  dt-bindings: interconnect: qcom: Remove ipa-virt compatibles
  interconnect: qcom: sc8280xp: Drop IP0 interconnects
  interconnect: qcom: sc8180x: Drop IP0 interconnects
  interconnect: qcom: sm8250: Drop IP0 interconnects
  interconnect: qcom: sm8150: Drop IP0 interconnects
  interconnect: move ignore_list out of of_count_icc_providers()
  interconnect: qcom: sc7180: drop IP0 remnants
  ...
parents d38e781e 7bf0008a

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,qdu1000-rpmh.yaml

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

%YAML 1.2

---

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

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



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



maintainers:

  - Georgi Djakov <djakov@kernel.org>

  - Odelu Kukatla <quic_okukatla@quicinc.com>



description: |

   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

   least one RPMh device child node pertaining to their RSC and each provider

   can map to multiple RPMh resources.



properties:

  compatible:

    enum:

      - qcom,qdu1000-clk-virt

      - qcom,qdu1000-gem-noc

      - qcom,qdu1000-mc-virt

      - qcom,qdu1000-system-noc



  '#interconnect-cells': true



  reg:

    maxItems: 1



allOf:

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

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,qdu1000-clk-virt

              - qcom,qdu1000-mc-virt

    then:

      properties:

        reg: false

    else:

      required:

        - reg



required:

  - compatible



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interconnect/qcom,qdu1000-rpmh.h>



    system_noc: interconnect@1640000 {

        compatible = "qcom,qdu1000-system-noc";

        reg = <0x1640000 0x45080>;

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };



    clk_virt: interconnect-0 {

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

        #interconnect-cells = <2>;

        qcom,bcm-voters = <&apps_bcm_voter>;

    };

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

+42 −31
Original line number Diff line number Diff line
@@ -62,6 +62,37 @@ properties: 
  power-domains:

    maxItems: 1



# Child node's properties

patternProperties:

  '^interconnect-[a-z0-9]+$':

    type: object

    description:

      snoc-mm is a child of snoc, sharing snoc's register address space.



    properties:

      compatible:

        enum:

          - qcom,msm8939-snoc-mm



      '#interconnect-cells':

        const: 1



      clock-names:

        items:

          - const: bus

          - const: bus_a



      clocks:

        items:

          - description: Bus Clock

          - description: Bus A Clock



    required:

      - compatible

      - '#interconnect-cells'

      - clock-names

      - clocks



required:

  - compatible

  - reg
@@ -108,37 +139,6 @@ allOf: 
            - description: Bus Clock

            - description: Bus A Clock



      # Child node's properties

      patternProperties:

        '^interconnect-[a-z0-9]+$':

          type: object

          description:

            snoc-mm is a child of snoc, sharing snoc's register address space.



          properties:

            compatible:

              enum:

                - qcom,msm8939-snoc-mm



            '#interconnect-cells':

              const: 1



            clock-names:

              items:

                - const: bus

                - const: bus_a



            clocks:

              items:

                - description: Bus Clock

                - description: Bus A Clock



          required:

            - compatible

            - '#interconnect-cells'

            - clock-names

            - clocks



  - if:

      properties:

        compatible:
@@ -237,6 +237,17 @@ allOf: 
            - description: Aggregate2 USB3 AXI Clock.

            - description: Config NoC USB2 AXI Clock.



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - qcom,msm8939-snoc

    then:

      patternProperties:

        '^interconnect-[a-z0-9]+$': false



examples:

  - |

      #include <dt-bindings/clock/qcom,rpmcc.h>

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

+8 −38
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
@@ -58,23 +46,18 @@ properties: 
      - qcom,sc8180x-config-noc

      - qcom,sc8180x-dc-noc

      - qcom,sc8180x-gem-noc

      - qcom,sc8180x-ipa-virt

      - qcom,sc8180x-mc-virt

      - 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
@@ -96,7 +79,6 @@ properties: 
      - qcom,sm8150-config-noc

      - qcom,sm8150-dc-noc

      - qcom,sm8150-gem-noc

      - qcom,sm8150-ipa-virt

      - qcom,sm8150-mc-virt

      - qcom,sm8150-mmss-noc

      - qcom,sm8150-system-noc
@@ -106,7 +88,6 @@ properties: 
      - qcom,sm8250-config-noc

      - qcom,sm8250-dc-noc

      - qcom,sm8250-gem-noc

      - qcom,sm8250-ipa-virt

      - qcom,sm8250-mc-virt

      - qcom,sm8250-mmss-noc

      - qcom,sm8250-npu-noc
@@ -121,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