From bc230a705e885acac11b63f71f161df51b3bf2c4 Mon Sep 17 00:00:00 2001
From: Shreyas K K <shrekk@qti.qualcomm.com>
Date: Wed, 17 Mar 2021 14:19:19 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add LLCC device nodes for Direwolf

Add device nodes for Last level cache controller for
Direwolf target.

Change-Id: I7b207f8a63a9f466e5e3f1767b130137704fc73d
---
 bindings/arm/msm/qcom,llcc.txt |  1 +
 qcom/direwolf.dtsi             | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/bindings/arm/msm/qcom,llcc.txt b/bindings/arm/msm/qcom,llcc.txt
index dc9c20cfec7b..2705ee9b1b5d 100644
--- a/bindings/arm/msm/qcom,llcc.txt
+++ b/bindings/arm/msm/qcom,llcc.txt
@@ -15,6 +15,7 @@ Properties:
 	            or "qcom,shima-llcc" or "qcom,sdxlemur-llcc"
 	            or "qcom,yupik-llcc" or "qcom,sm8150-llcc"
 		    or "qcom,sdmshrike-llcc" or "qcom,sm6150-llcc"
+		    or "qcom,direwolf-llcc"
 		    "qcom,llcc-v2" must be appended for V2 hardware.
 
 - reg:
diff --git a/qcom/direwolf.dtsi b/qcom/direwolf.dtsi
index d2c3003d9a91..3eb5ba2ff0aa 100644
--- a/qcom/direwolf.dtsi
+++ b/qcom/direwolf.dtsi
@@ -1082,6 +1082,16 @@
 		#mbox-cells = <1>;
 	};
 
+	cache-controller@9200000 {
+		compatible = "qcom,direwolf-llcc", "qcom,llcc-v2";
+		reg = <0x9200000 0x1d0000> , <0x9600000 0x50000>;
+		reg-names = "llcc_base", "llcc_broadcast_base";
+		cap-based-alloc-and-pwr-collapse;
+		interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&aopcc QDSS_CLK>;
+		clock-names = "qdss_clk";
+	};
+
 	llcc_pmu: llcc-pmu@9095000 {
 		compatible = "qcom,llcc-pmu-ver2";
 		reg = <0x09095000 0x300>;

From 5ead592ae2871f409f9cbaa2e08838e499f9bef1 Mon Sep 17 00:00:00 2001
From: Shreyas K K <shrekk@qti.qualcomm.com>
Date: Wed, 10 Mar 2021 13:38:08 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add ION support for Direwolf

Add ION support for Direwolf target.

Change-Id: Ifd42df124041771aa84f665c085a45765d7208b6
---
 qcom/direwolf-ion.dtsi | 14 ++++++++++++++
 qcom/direwolf.dtsi     |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 qcom/direwolf-ion.dtsi

diff --git a/qcom/direwolf-ion.dtsi b/qcom/direwolf-ion.dtsi
new file mode 100644
index 000000000000..fbd71987b0bc
--- /dev/null
+++ b/qcom/direwolf-ion.dtsi
@@ -0,0 +1,14 @@
+#include <dt-bindings/arm/msm/msm_ion_ids.h>
+
+&soc {
+	msm_ion: qcom,ion {
+		compatible = "qcom,msm-ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		system_heap: qcom,ion-heap@25 {
+			reg = <ION_SYSTEM_HEAP_ID>;
+			qcom,ion-heap-type = "MSM_SYSTEM";
+		};
+	};
+};
diff --git a/qcom/direwolf.dtsi b/qcom/direwolf.dtsi
index 3eb5ba2ff0aa..e7165829baef 100644
--- a/qcom/direwolf.dtsi
+++ b/qcom/direwolf.dtsi
@@ -1492,6 +1492,7 @@
 #include "direwolf-regulators.dtsi"
 #include "direwolf-pm.dtsi"
 #include "direwolf-gdsc.dtsi"
+#include "direwolf-ion.dtsi"
 
 &gcc_emac0_gdsc {
 	status = "ok";