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

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

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

 into char-misc-next

Georgi writes:

interconnect changes for 5.15

Here are changes for the 5.15-rc1 merge window consisting of interconnect
core and driver updates.

Framework change:
- Add sanity check to detect if node is already added to provider.

Driver changes:
- RPMh drivers probe function consolidation
- Add driver for SC8180x platforms
- Add support for SC8180x OSM L3
- Use driver-specific naming in OSM L3

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

* tag 'icc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: osm-l3: Use driver-specific naming
  interconnect: qcom: osm-l3: Add sc8180x support
  dt-bindings: interconnect: Add SC8180x to OSM L3 DT binding
  interconnect: qcom: Add SC8180x providers
  dt-bindings: interconnect: Add Qualcomm SC8180x DT bindings
  interconnect: Sanity check that node isn't already on list
  interconnect: qcom: icc-rpmh: Consolidate probe functions
parents 637d0957 8bf5d31c

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,sc8180x-osm-l3

      - qcom,sdm845-osm-l3

      - qcom,sm8150-osm-l3

      - qcom,sm8250-epss-l3

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

+11 −0
Original line number Diff line number Diff line
@@ -49,6 +49,17 @@ properties: 
      - qcom,sc7280-mmss-noc

      - qcom,sc7280-nsp-noc

      - qcom,sc7280-system-noc

      - qcom,sc8180x-aggre1-noc

      - qcom,sc8180x-aggre2-noc

      - qcom,sc8180x-camnoc-virt

      - qcom,sc8180x-compute-noc

      - qcom,sc8180x-config-noc

      - qcom,sc8180x-dc-noc

      - qcom,sc8180x-gem-noc

      - qcom,sc8180x-ipa-virt

      - qcom,sc8180x-mc-virt

      - qcom,sc8180x-mmss-noc

      - qcom,sc8180x-system-noc

      - qcom,sdm845-aggre1-noc

      - qcom,sdm845-aggre2-noc

      - qcom,sdm845-config-noc

drivers/interconnect/core.c

+3 −0
Original line number Diff line number Diff line
@@ -959,6 +959,9 @@ EXPORT_SYMBOL_GPL(icc_link_destroy); 
 */

void icc_node_add(struct icc_node *node, struct icc_provider *provider)

{

	if (WARN_ON(node->provider))

		return;



	mutex_lock(&icc_lock);



	node->provider = provider;

drivers/interconnect/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,15 @@ config INTERCONNECT_QCOM_SC7280 
	  This is a driver for the Qualcomm Network-on-Chip on sc7280-based

	  platforms.



config INTERCONNECT_QCOM_SC8180X

	tristate "Qualcomm SC8180X 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 sc8180x-based

	  platforms.



config INTERCONNECT_QCOM_SDM660

	tristate "Qualcomm SDM660 interconnect driver"

	depends on INTERCONNECT_QCOM

drivers/interconnect/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ qnoc-qcs404-objs := qcs404.o 
icc-rpmh-obj				:= icc-rpmh.o

qnoc-sc7180-objs			:= sc7180.o

qnoc-sc7280-objs                        := sc7280.o

qnoc-sc8180x-objs			:= sc8180x.o

qnoc-sdm660-objs			:= sdm660.o

qnoc-sdm845-objs			:= sdm845.o

qnoc-sdx55-objs				:= sdx55.o
@@ -26,6 +27,7 @@ obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o 
obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o

obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o

obj-$(CONFIG_INTERCONNECT_QCOM_SC7280) += qnoc-sc7280.o

obj-$(CONFIG_INTERCONNECT_QCOM_SC8180X) += qnoc-sc8180x.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDM660) += qnoc-sdm660.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDX55) += qnoc-sdx55.o