Merge remote-tracking branch 'remotes/trunk/bringup/amlogic-4.9/sync20190611_forQ...

diff --cc MAINTAINERS
index 0c57edb6e6c2c1d276c9cd26d4b4c3ddbdb9db4f,58c25232ed471f4fe28b2285b5a0d19ff7f6c7b6..bac51a3ed8290c4114e1a9feb977ac2daa8fa938
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15251,7 -15255,11 +15255,16 @@@ M: Brian Zhu <brian.zhu@amlogic.com
  F: drivers/amlogic/media/video_sink/video_receiver.c
  F: drivers/amlogic/media/video_sink/video_receiver.h
  
 +AMLOGIC DEADPOOL Y3 DTSI
 +M:    Xindong Xu <xindong.xu@amlogic.com>
 +F: arch/arm/boot/dts/amlogic/sm1_s905y3_deadpool.dts
 +F: arch/arm64/boot/dts/amlogic/sm1_s905y3_deadpool.dts
++
+ AMLOGIC UVM DRIVER
+ M:    Ao.Xu <ao.xu@amlogic.com>
+ F:    drivers/amlogic/uvm/meson_uvm.c
+ F:    drivers/amlogic/uvm/meson_uvm.h
+ 
+ AMLOGIC SM1/G12A BL40 HEADER
+ M: shunzhou jiang <shunzhou.jiang@amlogic.com>
+ F: drivers/amlogic/firmware/bl40_module.h

diff --cc arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
Simple merge

diff --cc arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
Simple merge

diff --cc drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c
Simple merge