diff --git a/qcom/sun-rumi-overlay.dts b/qcom/sun-rumi-overlay.dts
index 921586a1..29bff8ba 100644
--- a/qcom/sun-rumi-overlay.dts
+++ b/qcom/sun-rumi-overlay.dts
@@ -4,9 +4,8 @@
  */
 
 /dts-v1/;
-/memreserve/ 0x90000000 0x100000;
+/plugin/;
 
-#include "sun.dtsi"
 #include "sun-rumi.dtsi"
 
 / {
diff --git a/qcom/sun-rumi.dtsi b/qcom/sun-rumi.dtsi
index 3d04c49f..a65905b5 100644
--- a/qcom/sun-rumi.dtsi
+++ b/qcom/sun-rumi.dtsi
@@ -11,11 +11,11 @@
 };
 
 &arch_timer {
-	clock-frequency = <192000>;
+	clock-frequency = <500000>;
 };
 
 &memtimer {
-	clock-frequency = <192000>;
+	clock-frequency = <500000>;
 };
 
 &qupv3_se7_2uart {
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index 0f69938c..6d587057 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -45,8 +45,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x0>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 			L2_0: l2-cache {
 			      compatible = "arm,arch-cache";
@@ -58,8 +57,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x100>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 		};
 
@@ -67,8 +65,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x200>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 		};
 
@@ -76,8 +73,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x300>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 		};
 
@@ -85,8 +81,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x400>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 		};
 
@@ -94,8 +89,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x500>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_0>;
 		};
 
@@ -103,8 +97,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x10000>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_6>;
 			L2_6: l2-cache {
 			      compatible = "arm,arch-cache";
@@ -116,8 +109,7 @@
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x10100>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0x0 0x90000000>;
+			enable-method = "psci";
 			next-level-cache = <&L2_6>;
 		};
 
@@ -284,6 +276,9 @@
 		clock-frequency = <19200000>;
 	};
 
+	qcom_tzlog: tz-log@0 {
+	};
+
 	clk_virt: interconnect@0 {
 		compatible = "qcom,sun-clk_virt";
 		qcom,stub;
@@ -734,6 +729,11 @@
 		compatible = "qcom,stub-regulator";
 		regulator-name = "video_cc_mvs0c_gdsc";
 	};
+
+	psci {
+		compatible = "arm,psci-1.0";
+		method = "smc";
+	};
 };
 
 &reserved_memory {