diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index 57ca4febec69..8296d40ffe6e 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -2154,6 +2154,7 @@
 		reg = <0x7040000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2165,6 +2166,7 @@
 		reg = <0x7140000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2176,6 +2178,7 @@
 		reg = <0x7240000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2187,6 +2190,7 @@
 		reg = <0x7340000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2198,6 +2202,7 @@
 		reg = <0x7440000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2209,6 +2214,7 @@
 		reg = <0x7540000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2220,6 +2226,7 @@
 		reg = <0x7640000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";
 
@@ -2231,6 +2238,7 @@
 		reg = <0x7740000 0x1000>;
 		reg-names = "etm-base";
 
+		status = "disabled";
 		clocks = <&clock_aop QDSS_CLK>;
 		clock-names = "core_clk";