From fda06d24afb636f4c78c01e15cb973b11ff67bad Mon Sep 17 00:00:00 2001
From: Ajit Vaishya <avaishya@qti.qualcomm.com>
Date: Mon, 8 Mar 2021 00:11:32 -0800
Subject: [PATCH] ARM: dts: msm: Add interconnect aggregation noc

- This fix Adds interconnect binding to aggre1_noc
  for cnss node.
- Includes yupik.h in all iot yupik overlay dts file.

Change-Id: I36bcd11ab02384cccb0b4a42a707ca6822b51c6b
CRs-Fixed: 2894446
---
 qcom/qcx6490-cnss.dtsi          | 5 +++++
 qcom/yupik-iot-hsp-overlay.dts  | 1 +
 qcom/yupik-iot-idp-overlay.dts  | 1 +
 qcom/yupikp-iot-hsp-overlay.dts | 1 +
 qcom/yupikp-iot-idp-overlay.dts | 1 +
 5 files changed, 9 insertions(+)

diff --git a/qcom/qcx6490-cnss.dtsi b/qcom/qcx6490-cnss.dtsi
index 3e503af89451..6a3f68c6e68b 100644
--- a/qcom/qcx6490-cnss.dtsi
+++ b/qcom/qcx6490-cnss.dtsi
@@ -25,6 +25,11 @@
 		wlan-ant-switch-supply = <&L11C>;
 		qcom,wlan-ant-switch-config = <2800000 2800000 0 0 0>;
 
+		interconnects =
+		<&aggre1_noc MASTER_PCIE_0 &aggre1_noc SLAVE_ANOC_PCIE_GEM_NOC>,
+		<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
+		interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
+
 		qcom,icc-path-count = <2>;
 		qcom,bus-bw-cfg-count = <7>;
 		qcom,bus-bw-cfg =
diff --git a/qcom/yupik-iot-hsp-overlay.dts b/qcom/yupik-iot-hsp-overlay.dts
index 24ffe035be8e..ff3f722b20fc 100644
--- a/qcom/yupik-iot-hsp-overlay.dts
+++ b/qcom/yupik-iot-hsp-overlay.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/interconnect/qcom,yupik.h>
 #include "yupik-iot-hsp.dtsi"
 
 / {
diff --git a/qcom/yupik-iot-idp-overlay.dts b/qcom/yupik-iot-idp-overlay.dts
index 359966e32f06..fcf60a41d2d6 100644
--- a/qcom/yupik-iot-idp-overlay.dts
+++ b/qcom/yupik-iot-idp-overlay.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/interconnect/qcom,yupik.h>
 #include "yupik-iot-idp.dtsi"
 
 / {
diff --git a/qcom/yupikp-iot-hsp-overlay.dts b/qcom/yupikp-iot-hsp-overlay.dts
index 9d08f6544d7f..5bce4a9f4d0f 100644
--- a/qcom/yupikp-iot-hsp-overlay.dts
+++ b/qcom/yupikp-iot-hsp-overlay.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/interconnect/qcom,yupik.h>
 #include "yupikp-iot-hsp.dtsi"
 
 / {
diff --git a/qcom/yupikp-iot-idp-overlay.dts b/qcom/yupikp-iot-idp-overlay.dts
index 01da5d563edd..b90731fe0dfb 100644
--- a/qcom/yupikp-iot-idp-overlay.dts
+++ b/qcom/yupikp-iot-idp-overlay.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/interconnect/qcom,yupik.h>
 #include "yupikp-idp.dtsi"
 
 / {