Commit 732065df authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.2-rc5' of... 

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

 into char-misc-linus

Georgi writes:

interconnect fixes for v6.2-rc

This contains fixes for a rare boot hang issue that has been reported
on the db820c dragonboard.

- dt-bindings: interconnect: Add UFS clocks to MSM8996 A2NoC
- interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
- interconnect: qcom: msm8996: Fix regmap max_register values
- interconnect: qcom: rpm: Use _optional func for provider clocks

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

* tag 'icc-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: rpm: Use _optional func for provider clocks
  interconnect: qcom: msm8996: Fix regmap max_register values
  interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
  dt-bindings: interconnect: Add UFS clocks to MSM8996 A2NoC
parents 36225a7c dd42ec8e

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

+23 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ allOf: 
              - qcom,msm8939-pcnoc

              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8939-snoc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc

              - qcom,msm8996-pnoc
@@ -186,6 +185,29 @@ allOf: 
      required:

      required:

        - power-domains

        - power-domains





  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-a2noc



    then:

      properties:

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: aggre2_ufs_axi

            - const: ufs_axi



        clocks:

          items:

            - description: Bus Clock

            - description: Bus A Clock

            - description: Aggregate2 NoC UFS AXI Clock

            - description: UFS AXI Clock



  - if:

  - if:

      properties:

      properties:

        compatible:

        compatible:

drivers/interconnect/qcom/icc-rpm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -488,7 +488,7 @@ int qnoc_probe(struct platform_device *pdev) 
	}

	}





regmap_done:

regmap_done:

	ret = devm_clk_bulk_get(dev, qp->num_clks, qp->bus_clks);

	ret = devm_clk_bulk_get_optional(dev, qp->num_clks, qp->bus_clks);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/interconnect/qcom/msm8996.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -33,6 +33,13 @@ static const char * const bus_a0noc_clocks[] = { 
	"aggre0_noc_mpu_cfg"

	"aggre0_noc_mpu_cfg"

};

};





static const char * const bus_a2noc_clocks[] = {

	"bus",

	"bus_a",

	"aggre2_ufs_axi",

	"ufs_axi"

};



static const u16 mas_a0noc_common_links[] = {

static const u16 mas_a0noc_common_links[] = {

	MSM8996_SLAVE_A0NOC_SNOC

	MSM8996_SLAVE_A0NOC_SNOC

};

};
@@ -1806,7 +1813,7 @@ static const struct regmap_config msm8996_a0noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_bits	= 32,

	.reg_stride	= 4,

	.reg_stride	= 4,

	.val_bits	= 32,

	.val_bits	= 32,

	.max_register	= 0x9000,

	.max_register	= 0x6000,

	.fast_io	= true

	.fast_io	= true

};

};
@@ -1830,7 +1837,7 @@ static const struct regmap_config msm8996_a1noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_bits	= 32,

	.reg_stride	= 4,

	.reg_stride	= 4,

	.val_bits	= 32,

	.val_bits	= 32,

	.max_register	= 0x7000,

	.max_register	= 0x5000,

	.fast_io	= true

	.fast_io	= true

};

};
@@ -1851,7 +1858,7 @@ static const struct regmap_config msm8996_a2noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_bits	= 32,

	.reg_stride	= 4,

	.reg_stride	= 4,

	.val_bits	= 32,

	.val_bits	= 32,

	.max_register	= 0xa000,

	.max_register	= 0x7000,

	.fast_io	= true

	.fast_io	= true

};

};
@@ -1859,6 +1866,8 @@ static const struct qcom_icc_desc msm8996_a2noc = { 
	.type = QCOM_ICC_NOC,

	.type = QCOM_ICC_NOC,

	.nodes = a2noc_nodes,

	.nodes = a2noc_nodes,

	.num_nodes = ARRAY_SIZE(a2noc_nodes),

	.num_nodes = ARRAY_SIZE(a2noc_nodes),

	.clocks = bus_a2noc_clocks,

	.num_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.regmap_cfg = &msm8996_a2noc_regmap_config

	.regmap_cfg = &msm8996_a2noc_regmap_config

};

};
@@ -1877,7 +1886,7 @@ static const struct regmap_config msm8996_bimc_regmap_config = { 
	.reg_bits	= 32,

	.reg_bits	= 32,

	.reg_stride	= 4,

	.reg_stride	= 4,

	.val_bits	= 32,

	.val_bits	= 32,

	.max_register	= 0x62000,

	.max_register	= 0x5a000,

	.fast_io	= true

	.fast_io	= true

};

};
@@ -1988,7 +1997,7 @@ static const struct regmap_config msm8996_mnoc_regmap_config = { 
	.reg_bits	= 32,

	.reg_bits	= 32,

	.reg_stride	= 4,

	.reg_stride	= 4,

	.val_bits	= 32,

	.val_bits	= 32,

	.max_register	= 0x20000,

	.max_register	= 0x1c000,

	.fast_io	= true

	.fast_io	= true

};

};