From a92554f7e714071879d3fdbd388ba6849c6bc21f Mon Sep 17 00:00:00 2001
From: Amir Vajid <quic_avajid@quicinc.com>
Date: Wed, 13 Mar 2024 10:23:52 -0700
Subject: [PATCH] ARM: dts: msm: Add ddr voting to llcc bwmons for sun

Enable secondary ddr voting on llcc bwmons for sun
and remove existing ddr bwmon given this enablement.

Change-Id: Icbb1ad3fbf7b44bf66a64f3cc8cefe9061953015
Signed-off-by: Amir Vajid <quic_avajid@quicinc.com>
---
 qcom/sun-rumi.dtsi |  4 ----
 qcom/sun.dtsi      | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qcom/sun-rumi.dtsi b/qcom/sun-rumi.dtsi
index c62c4b0d..e1a52b5a 100644
--- a/qcom/sun-rumi.dtsi
+++ b/qcom/sun-rumi.dtsi
@@ -235,10 +235,6 @@
 	regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
 };
 
-&bwmon_ddr {
-	qcom,hw-timer-hz = <192000>;
-};
-
 &bwmon_llcc_gold {
 	qcom,hw-timer-hz = <192000>;
 };
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index bd3e89c0..e3c9a168 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -3376,14 +3376,16 @@
 		};
 	};
 
-	bwmon_ddr: qcom,bwmon-ddr@24091000 {
-		compatible = "qcom,bwmon5";
-		reg = <0x24091000 0x1000>;
-		reg-names = "base";
-		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-		qcom,hw-timer-hz = <19200000>;
-		qcom,count-unit = <0x10000>;
+	qcom_llcc_ddr_vote: qcom,llcc-ddr-vote {
 		qcom,target-dev = <&qcom_ddr_dcvs_hw>;
+		qcom,secondary-map =
+			<  350000  547000 >,
+			<  533000 1555000 >,
+			<  600000 2092000 >,
+			<  806000 3187000 >,
+			<  933000 3686000 >,
+			< 1066000 4224000 >,
+			< 1211000 4761000 >;
 	};
 
 	bwmon_llcc_gold: qcom,bwmon-llcc-gold@240B3300 {
@@ -3395,6 +3397,7 @@
 		qcom,hw-timer-hz = <19200000>;
 		qcom,count-unit = <0x10000>;
 		qcom,target-dev = <&qcom_llcc_dcvs_hw>;
+		qcom,second-vote = <&qcom_llcc_ddr_vote>;
 	};
 
 	bwmon_llcc_prime: qcom,bwmon-llcc-prime@240B7300 {
@@ -3406,6 +3409,7 @@
 		qcom,hw-timer-hz = <19200000>;
 		qcom,count-unit = <0x10000>;
 		qcom,target-dev = <&qcom_llcc_dcvs_hw>;
+		qcom,second-vote = <&qcom_llcc_ddr_vote>;
 	};
 
 	qcom,qrtr-gunyah-oemvm {