Merge branch 'icc-qcs615' into icc-next

Add interconnect dt-bindings and driver support for Qualcomm QCS615 SoC.

* icc-qcs615
  dt-bindings: interconnect: document the RPMh Network-On-Chip interconnect in QCS615 SoC
  interconnect: qcom: add QCS615 interconnect provider driver

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Georgi Djakov <[email protected]>

diff --cc drivers/interconnect/qcom/Kconfig
index bf125a4f2a7e98549ff4b382913071405ce3a06d,0f25ca4f77bf9139a89ae564a660dea383909eb9..06f6f804e1eaad91a8e150012818a1c0e507d84f
--- 1/drivers/interconnect/qcom/Kconfig
--- 2/drivers/interconnect/qcom/Kconfig
+++ b/drivers/interconnect/qcom/Kconfig
@@@ -105,17 -105,15 +105,26 @@@ config INTERCONNECT_QCOM_QCS40
          This is a driver for the Qualcomm Network-on-Chip on qcs404-based
          platforms.
  
+ config INTERCONNECT_QCOM_QCS615
+       tristate "Qualcomm QCS615 interconnect driver"
+       depends on INTERCONNECT_QCOM_RPMH_POSSIBLE
+       select INTERCONNECT_QCOM_RPMH
+       select INTERCONNECT_QCOM_BCM_VOTER
+       help
+         This is a driver for the Qualcomm Network-on-Chip on qcs615-based
+         platforms.
+ 
 +config INTERCONNECT_QCOM_QCS8300
 +      tristate "Qualcomm QCS8300 interconnect driver"
 +      depends on INTERCONNECT_QCOM_RPMH_POSSIBLE
 +      select INTERCONNECT_QCOM_RPMH
 +      select INTERCONNECT_QCOM_BCM_VOTER
 +      help
 +        This is a driver for the Qualcomm Technologies, Inc. Network-on-Chip
 +        on QCS8300-based platforms. The interconnect provider collects and
 +        aggreagates the cosumer bandwidth requests to satisfy constraints
 +        placed on Network-on-Chip performance states.
 +
  config INTERCONNECT_QCOM_QDU1000
        tristate "Qualcomm QDU1000/QRU1000 interconnect driver"
        depends on INTERCONNECT_QCOM_RPMH_POSSIBLE

diff --cc drivers/interconnect/qcom/Makefile
index 867355ad5699b25abaf0205e71f6e2a2c182711c,d3849265d45c3d41d82ecb41bcd4f50382b19f1c..95b5240da32c1ae835ff3ca4142c3ce0ea72739a
--- 1/drivers/interconnect/qcom/Makefile
--- 2/drivers/interconnect/qcom/Makefile
+++ b/drivers/interconnect/qcom/Makefile
@@@ -15,7 -15,7 +15,8 @@@ qnoc-msm8996-objs                     := msm8996.
  icc-osm-l3-objs                               := osm-l3.o
  qnoc-qcm2290-objs                     := qcm2290.o
  qnoc-qcs404-objs                      := qcs404.o
+ qnoc-qcs615-objs                      := qcs615.o
 +qnoc-qcs8300-objs                     := qcs8300.o
  qnoc-qdu1000-objs                     := qdu1000.o
  icc-rpmh-obj                          := icc-rpmh.o
  qnoc-sa8775p-objs                     := sa8775p.o
@@@ -53,7 -53,7 +54,8 @@@ obj-$(CONFIG_INTERCONNECT_QCOM_MSM8996
  obj-$(CONFIG_INTERCONNECT_QCOM_OSM_L3) += icc-osm-l3.o
  obj-$(CONFIG_INTERCONNECT_QCOM_QCM2290) += qnoc-qcm2290.o
  obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o
+ obj-$(CONFIG_INTERCONNECT_QCOM_QCS615) += qnoc-qcs615.o
 +obj-$(CONFIG_INTERCONNECT_QCOM_QCS8300) += qnoc-qcs8300.o
  obj-$(CONFIG_INTERCONNECT_QCOM_QDU1000) += qnoc-qdu1000.o
  obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o
  obj-$(CONFIG_INTERCONNECT_QCOM_SA8775P) += qnoc-sa8775p.o