From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 6 Mar 2024 14:03:31 +0000 (+0000)
Subject: Merge tag 'icc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc... 
X-Git-Tag: microblaze-v6.10~37^2~45
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=17bcddcd4a83bbb93b2db75235577aa5b3afea5d;p=linux-2.6-microblaze.git

Merge tag 'icc-6.9-rc1' of git://git./linux/kernel/git/djakov/icc into char-misc-next

Georgi writes:

interconnect changes for 6.9

This pull request contains the interconnect changes for the 6.9-rc1 merge
window. The highlights are below:

Core changes:
- Constify the of_phandle_args in xlate functions.

Driver changes:
- New interconnect driver for the MSM8909 platform.
- New interconnect driver for the SM7150 platform.
- Clean-up and removal of unused resources in drivers.
- Constify some pointers to structs.

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

* tag 'icc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: Add SM7150 driver support
  dt-bindings: interconnect: Add Qualcomm SM7150 DT bindings
  interconnect: constify of_phandle_args in xlate
  dt-bindings: interconnect: qcom,rpmh: Fix bouncing @codeaurora address
  interconnect: qcom: x1e80100: constify pointer to qcom_icc_bcm
  interconnect: qcom: sa8775p: constify pointer to qcom_icc_bcm
  interconnect: qcom: sm6115: constify pointer to qcom_icc_node
  interconnect: qcom: sm8250: constify pointer to qcom_icc_node
  interconnect: qcom: sa8775p: constify pointer to qcom_icc_node
  interconnect: qcom: msm8909: constify pointer to qcom_icc_node
  interconnect: qcom: x1e80100: Remove bogus per-RSC BCMs and nodes
  dt-bindings: interconnect: Remove bogus interconnect nodes
  interconnect: qcom: sm8550: Remove bogus per-RSC BCMs and nodes
  interconnect: qcom: Add MSM8909 interconnect provider driver
  dt-bindings: interconnect: Add Qualcomm MSM8909 DT bindings
---

17bcddcd4a83bbb93b2db75235577aa5b3afea5d
diff --cc drivers/interconnect/qcom/x1e80100.c
index cbaf4f9c41be,27a438d0505d..99824675ee3f
--- a/drivers/interconnect/qcom/x1e80100.c
+++ b/drivers/interconnect/qcom/x1e80100.c
@@@ -1514,79 -1370,8 +1370,9 @@@ static struct qcom_icc_node qns_aggre_u
  	.links = { X1E80100_MASTER_AGGRE_USB_SOUTH },
  };
  
- static struct qcom_icc_node qns_llcc_disp = {
- 	.name = "qns_llcc_disp",
- 	.id = X1E80100_SLAVE_LLCC_DISP,
- 	.channels = 8,
- 	.buswidth = 16,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_LLCC_DISP },
- };
- 
- static struct qcom_icc_node ebi_disp = {
- 	.name = "ebi_disp",
- 	.id = X1E80100_SLAVE_EBI1_DISP,
- 	.channels = 8,
- 	.buswidth = 4,
- 	.num_links = 0,
- };
- 
- static struct qcom_icc_node qns_mem_noc_hf_disp = {
- 	.name = "qns_mem_noc_hf_disp",
- 	.id = X1E80100_SLAVE_MNOC_HF_MEM_NOC_DISP,
- 	.channels = 2,
- 	.buswidth = 32,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_MNOC_HF_MEM_NOC_DISP },
- };
- 
- static struct qcom_icc_node qns_llcc_pcie = {
- 	.name = "qns_llcc_pcie",
- 	.id = X1E80100_SLAVE_LLCC_PCIE,
- 	.channels = 8,
- 	.buswidth = 16,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_LLCC_PCIE },
- };
- 
- static struct qcom_icc_node ebi_pcie = {
- 	.name = "ebi_pcie",
- 	.id = X1E80100_SLAVE_EBI1_PCIE,
- 	.channels = 8,
- 	.buswidth = 4,
- 	.num_links = 0,
- };
- 
- static struct qcom_icc_node qns_pcie_mem_noc_pcie = {
- 	.name = "qns_pcie_mem_noc_pcie",
- 	.id = X1E80100_SLAVE_ANOC_PCIE_GEM_NOC_PCIE,
- 	.channels = 1,
- 	.buswidth = 64,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_ANOC_PCIE_GEM_NOC_PCIE },
- };
- 
- static struct qcom_icc_node qns_pcie_north_gem_noc_pcie = {
- 	.name = "qns_pcie_north_gem_noc_pcie",
- 	.id = X1E80100_SLAVE_PCIE_NORTH_PCIE,
- 	.channels = 1,
- 	.buswidth = 64,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_PCIE_NORTH_PCIE },
- };
- 
- static struct qcom_icc_node qns_pcie_south_gem_noc_pcie = {
- 	.name = "qns_pcie_south_gem_noc_pcie",
- 	.id = X1E80100_SLAVE_PCIE_SOUTH_PCIE,
- 	.channels = 1,
- 	.buswidth = 64,
- 	.num_links = 1,
- 	.links = { X1E80100_MASTER_PCIE_SOUTH_PCIE },
- };
- 
  static struct qcom_icc_bcm bcm_acv = {
  	.name = "ACV",
 +	.enable_mask = BIT(3),
  	.num_nodes = 1,
  	.nodes = { &ebi },
  };