Commit 9d06852b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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

 into char-misc-next

Georgi writes:

interconnect changes for 6.12

This pull request contains the interconnect changes for the 6.12-rc1 merge
window. It contains new drivers and fixes with the following highlights:

Driver changes:
- New driver for MSM8976 platforms
- New driver for MSM8937 platforms
- Enable sync_state for SM8250 platforms
- Enable QoS support for QCS404
- Add ab_coeff bandwidth adjustments for MSM8953
- Drop the unsupported yet DISP nodes on SM8350 platforms
- Fix missed num_nodes initialization in icc-clk driver
- Misc DT and documentation fixes

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

* tag 'icc-6.12-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  dt-bindings: interconnect: qcom: Do not require reg for sc8180x virt NoCs
  dt-bindings: interconnect: qcom-bwmon: Document SA8775p bwmon compatibles
  dt-bindings: interconnect: qcom: msm8953: Fix 'See also' in description
  interconnect: qcom: msm8953: Add ab_coeff
  dt-bindings: interconnect: qcom: msm8939: Fix example
  interconnect: qcom: qcs404: Add regmaps and more bus descriptions
  interconnect: qcom: qcs404: Mark AP-owned nodes as such
  interconnect: qcom: Add MSM8937 interconnect provider driver
  interconnect: qcom: sm8250: Enable sync_state
  dt-bindings: interconnect: qcom,sm8350: drop DISP nodes
  interconnect: qcom: sm8350: drop DISP nodes
  dt-bindings: interconnect: qcom: Add Qualcomm MSM8937 NoC
  interconnect: qcom: Add MSM8976 interconnect provider driver
  dt-bindings: interconnect: qcom: Add Qualcomm MSM8976 NoC
  interconnect: icc-clk: Add missed num_nodes initialization
  dt-bindings: interconnect: qcom,rpmh: correct sm8150 camnoc
parents 3ff77190 a5733950

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

+14 −11
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 
$id: http://devicetree.org/schemas/interconnect/qcom,msm8939.yaml#

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



title: Qualcomm MSM8939 Network-On-Chip interconnect

title: Qualcomm MSM8937/MSM8939/MSM8976 Network-On-Chip interconnect



maintainers:

  - Konrad Dybcio <konradybcio@kernel.org>



description: |

  The Qualcomm MSM8939 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.

description:

  The Qualcomm MSM8937/MSM8939/MSM8976 interconnect providers support

  adjusting the bandwidth requirements between the various NoC fabrics.



allOf:

  - $ref: qcom,rpm-common.yaml#
@@ -19,9 +19,15 @@ allOf: 
properties:

  compatible:

    enum:

      - qcom,msm8937-bimc

      - qcom,msm8937-pcnoc

      - qcom,msm8937-snoc

      - qcom,msm8939-bimc

      - qcom,msm8939-pcnoc

      - qcom,msm8939-snoc

      - qcom,msm8976-bimc

      - qcom,msm8976-pcnoc

      - qcom,msm8976-snoc



  reg:

    maxItems: 1
@@ -39,7 +45,10 @@ patternProperties: 


    properties:

      compatible:

        const: qcom,msm8939-snoc-mm

        enum:

          - qcom,msm8937-snoc-mm

          - qcom,msm8939-snoc-mm

          - qcom,msm8976-snoc-mm



    required:

      - compatible
@@ -60,12 +69,6 @@ examples: 
        compatible = "qcom,msm8939-snoc";

        reg = <0x00580000 0x14000>;

        #interconnect-cells = <1>;

    };



    bimc: interconnect@400000 {

        compatible = "qcom,msm8939-bimc";

        reg = <0x00400000 0x62000>;

        #interconnect-cells = <1>;



          snoc_mm: interconnect-snoc {

              compatible = "qcom,msm8939-snoc-mm";

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

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ description: | 
  The Qualcomm MSM8953 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.



  See also:

  - dt-bindings/interconnect/qcom,msm8953.h

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



properties:

  compatible:

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - items:

          - enum:

              - qcom,qcm2290-cpu-bwmon

              - qcom,sa8775p-cpu-bwmon

              - qcom,sc7180-cpu-bwmon

              - qcom,sc7280-cpu-bwmon

              - qcom,sc8280xp-cpu-bwmon
@@ -39,6 +40,7 @@ properties: 
          - const: qcom,sdm845-bwmon    # BWMON v4, unified register space

      - items:

          - enum:

              - qcom,sa8775p-llcc-bwmon

              - qcom,sc7180-llcc-bwmon

              - qcom,sc8280xp-llcc-bwmon

              - qcom,sm6350-cpu-bwmon

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

+4 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ properties: 
      - qcom,sdx65-system-noc

      - qcom,sm8150-aggre1-noc

      - qcom,sm8150-aggre2-noc

      - qcom,sm8150-camnoc-noc

      - qcom,sm8150-camnoc-virt

      - qcom,sm8150-compute-noc

      - qcom,sm8150-config-noc

      - qcom,sm8150-dc-noc
@@ -113,6 +113,9 @@ allOf: 
        properties:

          compatible:

            enum:

              - qcom,sc8180x-camnoc-virt

              - qcom,sc8180x-mc-virt

              - qcom,sc8180x-qup-virt

              - qcom,sdx65-mc-virt

              - qcom,sm8250-qup-virt

    then:

drivers/interconnect/icc-clk.c

+1 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct icc_provider *icc_clk_register(struct device *dev, 
	onecell = devm_kzalloc(dev, struct_size(onecell, nodes, 2 * num_clocks), GFP_KERNEL);

	if (!onecell)

		return ERR_PTR(-ENOMEM);

	onecell->num_nodes = 2 * num_clocks;



	qp = devm_kzalloc(dev, struct_size(qp, clocks, num_clocks), GFP_KERNEL);

	if (!qp)
@@ -133,8 +134,6 @@ struct icc_provider *icc_clk_register(struct device *dev, 
		onecell->nodes[j++] = node;

	}



	onecell->num_nodes = j;



	ret = icc_provider_register(provider);

	if (ret)

		goto err;