Commit 96657eb5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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

 into char-misc-next

Georgi writes:

interconnect changes for 6.20

This pull request contains the interconnect changes for the 6.20-rc1
merge window. The core and driver changes are listed below.

Core changes:
- Add KUnit tests for core functionality

Driver changes:
- New driver for MediaTek MT8196 EMI
- MediaTek driver fixes
- Support for Glymur BWMONs
- QCS8300 driver topology fix
- Misc cleanups

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

* tag 'icc-6.20-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: msm8974: drop duplicated RPM_BUS_{MASTER,SLAVE}_REQ defines
  interconnect: qcom: smd-rpm: drop duplicated QCOM_RPM_SMD_KEY_RATE define
  dt-bindings: interconnect: qcom-bwmon: Document Glymur BWMONs
  interconnect: qcom: qcs8300: fix the num_links for nsp icc node
  interconnect: Add kunit tests for core functionality
  dt-bindings: interconnect: qcom,qcs615-rpmh: Drop IPA interconnects
  interconnect: mediatek: Aggregate bandwidth with saturating add
  interconnect: mediatek: Don't hijack parent device
  interconnect: mediatek: Add support for MediaTek MT8196 EMI ICC
  dt-bindings: interconnect: mt8183-emi: Add support for MT8196 EMI
parents 370fdb98 0e841d1d

Documentation/devicetree/bindings/interconnect/mediatek,mt8183-emi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ properties: 
    enum:

      - mediatek,mt8183-emi

      - mediatek,mt8195-emi

      - mediatek,mt8196-emi



  '#interconnect-cells':

    const: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
      - const: qcom,msm8998-bwmon       # BWMON v4

      - items:

          - enum:

              - qcom,glymur-cpu-bwmon

              - qcom,kaanapali-cpu-bwmon

              - qcom,qcm2290-cpu-bwmon

              - qcom,qcs615-cpu-bwmon

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

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ properties: 
      - qcom,qcs615-config-noc

      - qcom,qcs615-dc-noc

      - qcom,qcs615-gem-noc

      - qcom,qcs615-ipa-virt

      - qcom,qcs615-mc-virt

      - qcom,qcs615-mmss-noc

      - qcom,qcs615-system-noc
@@ -46,7 +45,6 @@ allOf: 
          contains:

            enum:

              - qcom,qcs615-camnoc-virt

              - qcom,qcs615-ipa-virt

              - qcom,qcs615-mc-virt

    then:

      properties:

drivers/interconnect/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -22,4 +22,18 @@ config INTERCONNECT_CLK 
	help

	  Support for wrapping clocks into the interconnect nodes.



config INTERCONNECT_KUNIT_TEST

	tristate "KUnit tests for Interconnect framework"

	depends on KUNIT

	default KUNIT_ALL_TESTS

	help

	  This builds the KUnit test suite for the generic system interconnect

	  framework.



	  The tests cover the core functionality of the interconnect subsystem,

	  including provider/consumer APIs, topology management, and bandwidth

	  aggregation logic.



	  If unsure, say N.



endif

drivers/interconnect/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,3 +10,5 @@ obj-$(CONFIG_INTERCONNECT_QCOM) += qcom/ 
obj-$(CONFIG_INTERCONNECT_SAMSUNG)	+= samsung/



obj-$(CONFIG_INTERCONNECT_CLK)		+= icc-clk.o



obj-$(CONFIG_INTERCONNECT_KUNIT_TEST) += icc-kunit.o