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/Makefile b/drivers/amlogic/debug/Makefile
index 2f07bf9..7576af9 100644
--- a/drivers/amlogic/debug/Makefile
+++ b/drivers/amlogic/debug/Makefile
@@ -1 +1,2 @@
obj-$(CONFIG_AMLOGIC_DEBUG_LOCKUP) += debug_lockup.o
+obj-$(CONFIG_AMLOGIC_DEBUG_ATRACE) += meson_atrace.o