Commit 1bc4deed authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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

 into char-misc-next

Georgi writes:

interconnect changes for 5.17

Here are the interconnect changes for the 5.17-rc1 merge window
consisting of new drivers, minor changes and fixes.

New drivers:
 - New driver for MSM8996 platforms
 - New driver for SC7280 EPSS L3 hardware
 - New driver for QCM2290 platforms
 - New driver for SM8450 platforms

Driver changes:
 - dt-bindings: interconnect: Combine SDM660 bindings into RPM schema
 - icc-rpm: Add support for bus power domain
 - icc-rpm: Use NOC_QOS_MODE_INVALID for qos_mode check
 - icc-rpm: Define ICC device type
 - icc-rpm: Add QNOC type QoS support
 - icc-rpm: Support child NoC device probe
 - icc-rpm: Prevent integer overflow in rate
 - icc-rpmh: Add BCMs to commit list in pre_aggregate

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

* tag 'icc-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: Add QCM2290 driver support
  dt-bindings: interconnect: Add Qualcomm QCM2290 NoC support
  interconnect: icc-rpm: Support child NoC device probe
  interconnect: icc-rpm: Add QNOC type QoS support
  interconnect: icc-rpm: Define ICC device type
  interconnect: qcom: Add SM8450 interconnect provider driver
  dt-bindings: interconnect: Add Qualcomm SM8450 DT bindings
  interconnect: qcom: rpm: Prevent integer overflow in rate
  interconnect: icc-rpm: Use NOC_QOS_MODE_INVALID for qos_mode check
  interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate
  interconnect: qcom: Add MSM8996 interconnect provider driver
  dt-bindings: interconnect: Add Qualcomm MSM8996 DT bindings
  interconnect: icc-rpm: Add support for bus power domain
  dt-bindings: interconnect: Combine SDM660 bindings into RPM schema
  interconnect: qcom: Add EPSS L3 support on SC7280
  dt-bindings: interconnect: Add EPSS L3 DT binding on SC7280
parents 1bb866dc 01f8938a

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

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
  compatible:

    enum:

      - qcom,sc7180-osm-l3

      - qcom,sc7280-epss-l3

      - qcom,sc8180x-osm-l3

      - qcom,sdm845-osm-l3

      - qcom,sm8150-osm-l3

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

0 → 100644
+137 −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,qcm2290.yaml#

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



title: Qualcomm QCM2290 Network-On-Chip interconnect



maintainers:

  - Shawn Guo <shawn.guo@linaro.org>



description: |

  The Qualcomm QCM2290 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.



properties:

  reg:

    maxItems: 1



  compatible:

    enum:

      - qcom,qcm2290-bimc

      - qcom,qcm2290-cnoc

      - qcom,qcm2290-snoc



  '#interconnect-cells':

    const: 1



  clock-names:

    items:

      - const: bus

      - const: bus_a



  clocks:

    items:

      - description: Bus Clock

      - description: Bus A Clock



# Child node's properties

patternProperties:

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

    type: object

    description:

      The interconnect providers do not have a separate QoS register space,

      but share parent's space.



    properties:

      compatible:

        enum:

          - qcom,qcm2290-qup-virt

          - qcom,qcm2290-mmrt-virt

          - qcom,qcm2290-mmnrt-virt



      '#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



    additionalProperties: false



required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks



additionalProperties: false



examples:

  - |

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



    snoc: interconnect@1880000 {

        compatible = "qcom,qcm2290-snoc";

        reg = <0x01880000 0x60200>;

        #interconnect-cells = <1>;

        clock-names = "bus", "bus_a";

        clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

                 <&rpmcc RPM_SMD_SNOC_A_CLK>;



        qup_virt: interconnect-qup {

            compatible = "qcom,qcm2290-qup-virt";

            #interconnect-cells = <1>;

            clock-names = "bus", "bus_a";

            clocks = <&rpmcc RPM_SMD_QUP_CLK>,

                     <&rpmcc RPM_SMD_QUP_A_CLK>;

        };



        mmnrt_virt: interconnect-mmnrt {

            compatible = "qcom,qcm2290-mmnrt-virt";

            #interconnect-cells = <1>;

            clock-names = "bus", "bus_a";

            clocks = <&rpmcc RPM_SMD_MMNRT_CLK>,

                     <&rpmcc RPM_SMD_MMNRT_A_CLK>;

        };



        mmrt_virt: interconnect-mmrt {

            compatible = "qcom,qcm2290-mmrt-virt";

            #interconnect-cells = <1>;

            clock-names = "bus", "bus_a";

            clocks = <&rpmcc RPM_SMD_MMRT_CLK>,

                     <&rpmcc RPM_SMD_MMRT_A_CLK>;

        };

    };



    cnoc: interconnect@1900000 {

        compatible = "qcom,qcm2290-cnoc";

        reg = <0x01900000 0x8200>;

        #interconnect-cells = <1>;

        clock-names = "bus", "bus_a";

        clocks = <&rpmcc RPM_SMD_CNOC_CLK>,

                 <&rpmcc RPM_SMD_CNOC_A_CLK>;

    };



    bimc: interconnect@4480000 {

        compatible = "qcom,qcm2290-bimc";

        reg = <0x04480000 0x80000>;

        #interconnect-cells = <1>;

        clock-names = "bus", "bus_a";

        clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

                 <&rpmcc RPM_SMD_BIMC_A_CLK>;

    };

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

+136 −7
Original line number Diff line number Diff line
@@ -27,13 +27,76 @@ properties: 
      - qcom,msm8939-pcnoc

      - qcom,msm8939-snoc

      - qcom,msm8939-snoc-mm

      - qcom,msm8996-a0noc

      - qcom,msm8996-a1noc

      - qcom,msm8996-a2noc

      - qcom,msm8996-bimc

      - qcom,msm8996-cnoc

      - qcom,msm8996-mnoc

      - qcom,msm8996-pnoc

      - qcom,msm8996-snoc

      - 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':

    const: 1



  clocks:

    minItems: 2

    maxItems: 7



  clock-names:

    minItems: 2

    maxItems: 7



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks



additionalProperties: false



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,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc

              - qcom,msm8996-snoc

              - 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
@@ -44,14 +107,80 @@ properties: 
              - description: Bus Clock

              - description: Bus A Clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-mnoc

              - 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,msm8996-a0noc



    then:

      properties:

        clock-names:

          items:

            - const: aggre0_snoc_axi

            - const: aggre0_cnoc_ahb

            - const: aggre0_noc_mpu_cfg



        clocks:

          items:

            - description: Aggregate0 System NoC AXI Clock.

            - description: Aggregate0 Config NoC AHB Clock.

            - description: Aggregate0 NoC MPU Clock.



      required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks

        - power-domains



additionalProperties: false

  - 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:

  - |

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

+11 −0
Original line number Diff line number Diff line
@@ -104,6 +104,17 @@ 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':

    enum: [ 1, 2 ]

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

deleted100644 → 0
+0 −185
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,sdm660.yaml#

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



title: Qualcomm SDM660 Network-On-Chip interconnect



maintainers:

  - AngeloGioacchino Del Regno <kholk11@gmail.com>



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 <dt-bindings/clock/qcom,rpmcc.h>

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

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



      bimc: interconnect@1008000 {

              compatible = "qcom,sdm660-bimc";

              reg = <0x01008000 0x78000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

                       <&rpmcc RPM_SMD_BIMC_A_CLK>;

      };



      cnoc: interconnect@1500000 {

              compatible = "qcom,sdm660-cnoc";

              reg = <0x01500000 0x10000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_CNOC_CLK>,

                       <&rpmcc RPM_SMD_CNOC_A_CLK>;

      };



      snoc: interconnect@1626000 {

              compatible = "qcom,sdm660-snoc";

              reg = <0x01626000 0x7090>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

                       <&rpmcc RPM_SMD_SNOC_A_CLK>;

      };



      a2noc: interconnect@1704000 {

              compatible = "qcom,sdm660-a2noc";

              reg = <0x01704000 0xc100>;

              #interconnect-cells = <1>;

              clock-names = "bus",

                            "bus_a",

                            "ipa",

                            "ufs_axi",

                            "aggre2_ufs_axi",

                            "aggre2_usb3_axi",

                            "cfg_noc_usb2_axi";

              clocks = <&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 = "qcom,sdm660-mnoc";

              reg = <0x01745000 0xa010>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a", "iface";

              clocks = <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>,

                       <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK_A>,

                       <&mmcc AHB_CLK_SRC>;

      };



      gnoc: interconnect@17900000 {

              compatible = "qcom,sdm660-gnoc";

              reg = <0x17900000 0xe000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&xo_board>, <&xo_board>;

      };