The following changes since commit 0ab4f9087ea94ff92dc2ae68180faaf6bd443021:
media: platform: add missing put_device() call in mtk_jpeg_probe() and mtk_jpeg_remove() (2020-11-05 18:03:11 +0100)
are available in the Git repository at:
git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.11f
for you to fetch changes up to 64ac96b6b758dba131e9599686451edf050eee61:
media: rockchip: rkisp1: destage Rockchip ISP1 driver (2020-11-11 11:49:25 +0100)
----------------------------------------------------------------
Tag branch
----------------------------------------------------------------
Helen Koike (2):
media: staging: rkisp1: cap: fix timeout when stopping the stream
media: rockchip: rkisp1: destage Rockchip ISP1 driver
Shunqian Zheng (1):
media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
.../devicetree/bindings/media/rockchip-isp1.yaml | 0
Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
MAINTAINERS | 5 +-
drivers/media/platform/Kconfig | 18 +++++++
drivers/media/platform/Makefile | 1 +
drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile | 0
.../media => media/platform/rockchip}/rkisp1/rkisp1-capture.c | 4 +-
.../media => media/platform/rockchip}/rkisp1/rkisp1-common.c | 0
.../media => media/platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
.../{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c | 3 +-
.../{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c | 1 -
.../media => media/platform/rockchip}/rkisp1/rkisp1-params.c | 86 ++++++++++++++++----------------
.../{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h | 0
.../media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c | 4 +-
.../{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c | 0
drivers/media/v4l2-core/v4l2-ioctl.c | 2 +
drivers/staging/media/Kconfig | 2 -
drivers/staging/media/Makefile | 1 -
drivers/staging/media/rkisp1/Kconfig | 19 -------
drivers/staging/media/rkisp1/TODO | 8 ---
.../staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h | 4 --
include/uapi/linux/videodev2.h | 4 ++
22 files changed, 80 insertions(+), 86 deletions(-)
rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (96%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
delete mode 100644 drivers/staging/media/rkisp1/Kconfig
delete mode 100644 drivers/staging/media/rkisp1/TODO
rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (99%)
