msm: qdss: facilitate compile time etm enablement

Change-Id: I25c9161436a5ca9a8579151b8c0f5fc86d512fb6
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 4209dc9..cb393c6 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1831,6 +1831,13 @@
 	help
 	  Enables support for Qualcomm Debug Subsystem.
 
+config MSM_QDSS_ETM_DEFAULT_ENABLE
+	bool "Turn on QDSS ETM Tracing by Default"
+	depends on MSM_QDSS
+	help
+	  Turns on QDSS ETM tracing by default. Otherwise, tracing is
+	  disabled by default but can be enabled by other means.
+
 config MSM_SLEEP_STATS
 	bool "Enable exporting of MSM sleep stats to userspace"
 	depends on CPU_IDLE
diff --git a/arch/arm/mach-msm/qdss-ptm.c b/arch/arm/mach-msm/qdss-ptm.c
index d0d841a..96a727a 100644
--- a/arch/arm/mach-msm/qdss-ptm.c
+++ b/arch/arm/mach-msm/qdss-ptm.c
@@ -114,7 +114,11 @@
 /* Forward declarations */
 static void ptm_cfg_rw_init(void);
 
+#ifdef CONFIG_MSM_QDSS_ETM_DEFAULT_ENABLE
+static int trace_on_boot = 1;
+#else
 static int trace_on_boot;
+#endif
 module_param_named(
 	trace_on_boot, trace_on_boot, int, S_IRUGO
 );