diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi
index 5d8aafc3..d735c7d3 100644
--- a/qcom/kera.dtsi
+++ b/qcom/kera.dtsi
@@ -30,7 +30,8 @@
 	};
 
 	chosen: chosen {
-		bootargs = "nokaslr kpti=0 log_buf_len=256K swiotlb=0 loop.max_part=7";
+		bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-1 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops";
+		stdout-path = "/soc/qcom,qupv3_1_geni_se@8c0000/qcom,qup_uart@894000:115200n8";
 	};
 
 	reserved_memory: reserved-memory {};
@@ -236,25 +237,6 @@
 		size = <0x0 0x2000000>;
 		linux,cma-default;
 	};
-
-	kinfo_mem: debug_kinfo_region {
-		alloc-ranges = <0x0 0x00000000 0xffffffff 0xffffffff>;
-		size = <0x0 0x1000>;
-		no-map;
-	};
-
-	va_md_mem: va_md_mem_region {
-		compatible = "shared-dma-pool";
-		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
-		reusable;
-		size = <0 0x1000000>;
-	};
-
-	ramoops_mem: ramoops-region {
-		alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>;
-		size = <0x0 0x200000>;
-		no-map;
-	};
 };
 
 &soc {
@@ -342,11 +324,6 @@
 		};
 	};
 
-	qcom,secure-buffer {
-		compatible = "qcom,secure-buffer";
-		qcom,vmid-cp-camera-preview-ro;
-	};
-
 	apps_rsc: rsc@17a00000 {
 		label = "apps_rsc";
 		compatible = "qcom,rpmh-rsc";
@@ -653,11 +630,6 @@
 		};
 	};
 
-	cpu_pmu: cpu-pmu {
-		compatible = "arm,armv8-pmuv3";
-		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
-	};
-
 	qcom,smp2p_sleepstate {
 		compatible = "qcom,smp2p-sleepstate";
 		qcom,smem-states = <&sleepstate_smp2p_out 0>;
@@ -666,64 +638,6 @@
 		interrupt-names = "smp2p-sleepstate-in";
 	};
 
-	qcom,msm-imem@14680000 {
-		compatible = "qcom,msm-imem";
-		reg = <0x14680000 0x1000>;
-		ranges = <0x0 0x14680000 0x1000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		mem_dump_table@10 {
-			compatible = "qcom,msm-imem-mem_dump_table";
-			reg = <0x10 0x8>;
-		};
-
-		restart_reason@65c {
-			compatible = "qcom,msm-imem-restart_reason";
-			reg = <0x65c 0x4>;
-		};
-
-		dload_type@1c {
-			compatible = "qcom,msm-imem-dload-type";
-			reg = <0x1c 0x4>;
-		};
-
-		boot_stats@6b0 {
-			compatible = "qcom,msm-imem-boot_stats";
-			reg = <0x6b0 0x20>;
-		};
-
-		kaslr_offset@6d0 {
-			compatible = "qcom,msm-imem-kaslr_offset";
-			reg = <0x6d0 0xc>;
-		};
-
-		pil@94c {
-			compatible = "qcom,pil-reloc-info";
-			reg = <0x94c 0xc8>;
-		};
-
-		pil@6dc {
-			compatible = "qcom,msm-imem-pil-disable-timeout";
-			reg = <0x6dc 0x4>;
-		};
-
-		diag_dload@c8 {
-			compatible = "qcom,msm-imem-diag-dload";
-			reg = <0xc8 0xc8>;
-		};
-
-		modem_dsm@c98 {
-			compatible = "qcom,msm-imem-mss-dsm";
-			reg = <0xc98 0x10>;
-		};
-
-		sys_dbg@af8 {
-			compatible = "qcom,msm-imem-gpu-dump-skip";
-			reg = <0xb0c 0x4>;
-		};
-	};
-
 	eud: qcom,msm-eud@88e0000 {
 		compatible = "qcom,msm-eud";
 		interrupt-names = "eud_irq";
@@ -737,35 +651,6 @@
 		status = "ok";
 	};
 
-	google,debug-kinfo {
-		compatible = "google,debug-kinfo";
-		memory-region = <&kinfo_mem>;
-	};
-
-	mini_dump_mode {
-		compatible = "qcom,minidump";
-		status = "ok";
-	};
-
-	va_mini_dump {
-		compatible = "qcom,va-minidump";
-		memory-region = <&va_md_mem>;
-		status = "ok";
-	};
-
-	qcom_ramoops {
-		compatible = "qcom,ramoops";
-		memory-region = <&ramoops_mem>;
-		pmsg-size = <0x200000>;
-		mem-type = <2>;
-	};
-
-	qcom,mpm2-sleep-counter@c221000 {
-		compatible = "qcom,mpm2-sleep-counter";
-		reg = <0xc221000 0x1000>;
-		clock-frequency = <32768>;
-	};
-
 	qcom,msm-adsprpc-mem {
 		compatible = "qcom,msm-adsprpc-mem-region";
 		memory-region = <&adsp_mem_heap>;
@@ -885,15 +770,6 @@
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
-
-	gh-secure-vm-loader@2 {
-		compatible = "qcom,gh-secure-vm-loader";
-		qcom,pas-id = <35>;
-		qcom,vmid = <50>;
-		qcom,firmware-name = "cpusys_vm";
-		memory-region = <&cpusys_vm_mem>;
-	};
-
 };
 
 #include "tuna-gdsc.dtsi"
diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index 0fa4c3a6..26202476 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -36,7 +36,8 @@
 	};
 
 	chosen: chosen {
-		bootargs = "nokaslr kpti=0 log_buf_len=256K swiotlb=0 loop.max_part=7";
+		bootargs = "log_buf_len=512K loglevel=6 cpufreq.default_governor=performance sysctl.kernel.sched_pelt_multiplier=4 no-steal-acc kpti=0 swiotlb=0 loop.max_part=7 irqaffinity=0-1 printk.console_no_auto_verbose=1 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kernel.panic_on_rcu_stall=1 disable_dma32=on cgroup_disable=pressure fw_devlink.strict=1 can.stats_timer=0 ftrace_dump_on_oops";
+		stdout-path = "/soc/qcom,qupv3_1_geni_se@ac0000/qcom,qup_uart@a9c000:115200n8";
 	};
 
 	reserved_memory: reserved-memory {};