Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / hwtracing / coresight / coresight-etm4x.h

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
index 5359c5197c1d6e4ccbbabe666785448bd47bdeef..ba8d3f86de2129dd869f156ade0d4a286ff158eb 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.h
+++ b/drivers/hwtracing/coresight/coresight-etm4x.h
@@ -183,6 +183,9 @@
 #define TRCSTATR_IDLE_BIT              0
 #define ETM_DEFAULT_ADDR_COMP          0
 
+/* PowerDown Control Register bits */
+#define TRCPDCR_PU                     BIT(3)
+
 /* secure state access levels */
 #define ETM_EXLEVEL_S_APP              BIT(8)
 #define ETM_EXLEVEL_S_OS               BIT(9)
@@ -407,14 +410,6 @@ enum etm_addr_ctxtype {
        ETM_CTX_CTXID_VMID,
 };
 
-enum etm_addr_type {
-       ETM_ADDR_TYPE_NONE,
-       ETM_ADDR_TYPE_SINGLE,
-       ETM_ADDR_TYPE_RANGE,
-       ETM_ADDR_TYPE_START,
-       ETM_ADDR_TYPE_STOP,
-};
-
 extern const struct attribute_group *coresight_etmv4_groups[];
 void etm4_config_trace_mode(struct etmv4_config *config);
 #endif