Commit 314cf651 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-sc8180x' into icc-next 

This contains a few fixes for the sc8180x interconnect provider driver to make
it functional.

* icc-sc8180x
  dt-bindings: interconnect: Add SC8180X QUP0 virt provider
  interconnect: qcom: sc8180x: Modernize sc8180x probe
  interconnect: qcom: sc8180x: Fix QUP0 nodes
  interconnect: qcom: sc8180x: Mark some BCMs keepalive

Link: https://lore.kernel.org/r/20220503211925.1022169-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents 016fca59 04548d4e

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

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ properties: 
      - qcom,sc8180x-ipa-virt

      - qcom,sc8180x-mc-virt

      - qcom,sc8180x-mmss-noc

      - qcom,sc8180x-qup-virt

      - qcom,sc8180x-system-noc

      - qcom,sc8280xp-aggre1-noc

      - qcom,sc8280xp-aggre2-noc

drivers/interconnect/qcom/sc8180x.c

+1581 −270

File changed.

Preview size limit exceeded, changes collapsed.

drivers/interconnect/qcom/sc8180x.h

+7 −0
Original line number Diff line number Diff line
@@ -171,4 +171,11 @@ 
#define SC8180X_MASTER_OSM_L3_APPS		161

#define SC8180X_SLAVE_OSM_L3			162



#define SC8180X_MASTER_QUP_CORE_0		163

#define SC8180X_MASTER_QUP_CORE_1		164

#define SC8180X_MASTER_QUP_CORE_2		165

#define SC8180X_SLAVE_QUP_CORE_0		166

#define SC8180X_SLAVE_QUP_CORE_1		167

#define SC8180X_SLAVE_QUP_CORE_2		168



#endif

include/dt-bindings/interconnect/qcom,sc8180x.h

+7 −0
Original line number Diff line number Diff line
@@ -182,4 +182,11 @@ 
#define SLAVE_MNOC_SF_MEM_NOC_DISPLAY		3

#define SLAVE_MNOC_HF_MEM_NOC_DISPLAY		4



#define MASTER_QUP_CORE_0			0

#define MASTER_QUP_CORE_1			1

#define MASTER_QUP_CORE_2			2

#define SLAVE_QUP_CORE_0			3

#define SLAVE_QUP_CORE_1			4

#define SLAVE_QUP_CORE_2			5



#endif