From: Mauro Carvalho Chehab Date: Mon, 7 Mar 2022 16:36:23 +0000 (+0100) Subject: Merge tag 'br-v5.18r' of git://linuxtv.org/hverkuil/media_tree into media_stage X-Git-Tag: v5.18-rc1~153^2~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92ec1a5c275acf8ec9999b7969a14745def5a8da;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'br-v5.18r' of git://linuxtv.org/hverkuil/media_tree into media_stage Tag branch * tag 'br-v5.18r' of git://linuxtv.org/hverkuil/media_tree: media: amphion: add amphion vpu entry in Kconfig and Makefile MAINTAINERS: add AMPHION VPU CODEC V4L2 driver entry media: amphion: implement malone decoder rpc interface media: amphion: implement windsor encoder rpc interface media: amphion: add v4l2 m2m vpu decoder stateful driver media: amphion: add v4l2 m2m vpu encoder stateful driver media: amphion: add vpu v4l2 m2m support media: amphion: implement vpu core communication based on mailbox media: amphion: add vpu core driver media: amphion: add amphion vpu device driver media: add nv12m_8l128 and nv12m_10be_8l128 video format. dt-bindings: media: amphion: add amphion video codec bindings Signed-off-by: Mauro Carvalho Chehab --- 92ec1a5c275acf8ec9999b7969a14745def5a8da