From: strongtz <strongtz@yeah.net>
Date: 星期天, 26 Jul 2020 07:27:24 +0000 (+0800)
Subject: Update device tree
X-Git-Tag: v0.1.2~2
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=ab95ac06890e6bb4c027549ed03c772d787e131b;p=edk2-sdm845.git

Update device tree
---

diff --git a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
index 67aa47c..f352768 100644
--- a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
+++ b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
@@ -8,10 +8,9 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include <dt-bindings/sound/qcom,q6afe.h>
-#include <dt-bindings/sound/qcom,q6asm.h>
 #include "sdm845.dtsi"
 #include "pm8998.dtsi"
+#include "pmi8998.dtsi"
 #include "pm8005.dtsi"
 
 / {
@@ -373,13 +372,15 @@
 
 &apps_smmu {
 	/* Enable this when upstream smmu driver gets patched */
-	status = "disabled";
+	status = "okay";
 };
 
 &gcc {
 	protected-clocks = <GCC_QSPI_CORE_CLK>,
 			   <GCC_QSPI_CORE_CLK_SRC>,
-			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;
+			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+			   <GCC_LPASS_Q6_AXI_CLK>,
+			   <GCC_LPASS_SWAY_CLK>;
 };
 
 /* NFC */
@@ -547,8 +548,6 @@
 };
 
 
-/* Uncomment these when smmu is working */
-
 &usb_1 {
 	status = "okay";
 };
@@ -578,7 +577,6 @@
 };
 
 
-
 &ufs_mem_hc {
 	status = "okay";
 	reset-gpios = <&tlmm 150 GPIO_ACTIVE_LOW>;
@@ -627,3 +625,74 @@
 		bias-pull-up;
 	};
 };
+
+/* Reserved memory changes */
+/*
+ * The memory regions related to the modem have to be changed 
+ * according to the adresses in downstream as
+ * the modem is hard-coded to expect these regions to be at those adresses.
+ * 
+ */
+/delete-node/ &rmtfs_mem;
+/delete-node/ &adsp_mem;
+/delete-node/ &wlan_msa_mem;
+/delete-node/ &mpss_region;
+/delete-node/ &venus_mem;
+/delete-node/ &cdsp_mem;
+/delete-node/ &mba_region;
+/delete-node/ &slpi_mem;
+/delete-node/ &spss_mem;
+
+/ {
+	reserved-memory {
+		rmtfs_mem: memory@f6301000 {
+			compatible = "qcom,rmtfs-mem";
+			reg = <0 0xf6301000 0 0x200000>;
+			no-map;
+
+			qcom,client-id = <1>;
+			qcom,vmid = <15>;
+		};
+
+		adsp_mem: memory@8c500000 {
+			reg = <0 0x8c500000 0 0x1e00000>;
+			no-map;
+		};
+
+		wlan_msa_mem: memory@8e300000 {
+			reg = <0 0x8e300000 0 0x100000>;
+			no-map;
+		};
+
+		mpss_region: memory@8e400000 {
+			reg = <0 0x8e400000 0 0x7800000>;
+			no-map;
+		};
+
+		venus_mem: memory@95c00000 {
+			reg = <0 0x95c00000 0 0x500000>;
+			no-map;
+		};
+
+		cdsp_mem: memory@96100000 {
+			reg = <0 0x96100000 0 0x800000>;
+			no-map;
+		};
+
+		mba_region: memory@96900000 {
+			reg = <0 0x96900000 0 0x200000>;
+			no-map;
+		};
+
+		slpi_mem: memory@96b00000 {
+			reg = <0 0x96b00000 0 0x1400000>;
+			no-map;
+		};
+
+		spss_mem: memory@97f00000 {
+			reg = <0 0x97f00000 0 0x100000>;
+			no-map;
+		};
+
+	};
+};