Revert "msm: debug: disable JTAG debugging and tracing across power collapse"

This reverts commit bc7be59f9de8030c6dc12d26f06df3fac4f235e6.

Change-Id: I0c4c26f70c53d21f823adb0c54ef5dafe58a74ba
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index a33c426..5198b8d 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -412,6 +412,7 @@
 	select ARCH_MSM_KRAIT
 	select MSM_SMP
 	select HAVE_ARCH_HAS_CURRENT_TIMER
+	select MSM_JTAG if MSM_QDSS
 	bool
 	select HAVE_HW_BRKPT_RESERVED_RW_ACCESS
 
@@ -2177,7 +2178,6 @@
 
 config MSM_JTAG
 	bool "JTAG and kernel debug and trace support across power collapse"
-	default n
 	help
 	  Enables support for kernel debugging (specifically breakpoints) and
 	  processor tracing across power collapse both for JTag and OS hosted
@@ -2190,6 +2190,7 @@
 config MSM_ETM
 	tristate "Enable MSM ETM and ETB"
 	depends on ARCH_MSM8X60
+	select MSM_JTAG
 	help
 	  Enables embedded trace collection on MSM8660