summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--MAINTAINERS1
-rw-r--r--drivers/amlogic/debug/Kconfig6
-rw-r--r--drivers/amlogic/debug/Makefile1
-rw-r--r--drivers/amlogic/debug/meson_atrace.c21
-rw-r--r--drivers/amlogic/media/frame_sync/timestamp.c4
-rw-r--r--drivers/amlogic/media/video_sink/video.c51
-rw-r--r--include/trace/events/meson_atrace.h7
7 files changed, 80 insertions, 11 deletions
diff --git a/drivers/amlogic/debug/Kconfig b/drivers/amlogic/debug/Kconfig
index 34af209..1bbc487 100644
--- a/drivers/amlogic/debug/Kconfig
+++ b/drivers/amlogic/debug/Kconfig
@@ -13,3 +13,9 @@ config AMLOGIC_DEBUG_LOCKUP
Debug lockup in isr and deaklock whit irq disabled.
When enable this config, Watchdog should be disabled.
+config AMLOGIC_DEBUG_ATRACE
+ bool "Amlogic Kernel ATrace"
+ depends on AMLOGIC_DEBUG
+ default y
+ help
+ Add android atrace compatible function