Merge tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f610d8bb82d0fc41b3d3e28cc19f3a7d2c2bf758..1bf9e71bc8bba9ea8fc8827d41ccd30a9a92dc7e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8936,7 +8936,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 F:     Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-F:     drivers/staging/media/hantro/
+F:     drivers/media/platform/verisilicon/
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:     Frank Seidel <frank@f-seidel.de>
@@ -13823,7 +13823,7 @@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 S:     Orphan
 W:     http://popies.net/meye/
 F:     Documentation/userspace-api/media/drivers/meye*
-F:     drivers/media/pci/meye/
+F:     drivers/staging/media/deprecated/meye/
 F:     include/uapi/linux/meye.h
 
 MOTORCOMM PHY DRIVER
@@ -14749,6 +14749,15 @@ S:     Orphan
 F:     Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
 F:     drivers/nfc/nxp-nci
 
+NXP i.MX 8MP DW100 V4L2 DRIVER
+M:     Xavier Roumegue <xavier.roumegue@oss.nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,dw100.yaml
+F:     Documentation/userspace-api/media/drivers/dw100.rst
+F:     drivers/media/platform/nxp/dw100/
+F:     include/uapi/linux/dw100.h
+
 NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
 M:     Mirela Rabulea <mirela.rabulea@nxp.com>
 R:     NXP Linux Team <linux-imx@nxp.com>
@@ -18004,8 +18013,7 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/common/saa7146/
-F:     drivers/media/pci/saa7146/
+F:     drivers/staging/media/deprecated/saa7146/
 F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
@@ -20428,6 +20436,7 @@ W:      https://linuxtv.org
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 F:     drivers/media/platform/ti/davinci/
+F:     drivers/staging/media/deprecated/vpfe_capture/
 F:     include/media/davinci/
 
 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@ -20568,7 +20577,7 @@ S:      Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/tm6000*
-F:     drivers/media/usb/tm6000/
+F:     drivers/staging/media/deprecated/tm6000/
 
 TMIO/SDHI MMC DRIVER
 M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
@@ -20668,9 +20677,10 @@ F:     include/linux/toshiba.h
 F:     include/uapi/linux/toshiba.h
 
 TOSHIBA TC358743 DRIVER
-M:     Mats Randgaard <matrandg@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/media/i2c/tc358743.txt
 F:     drivers/media/i2c/tc358743*
 F:     include/media/i2c/tc358743.h
 
@@ -21326,7 +21336,7 @@ S:      Maintained
 W:     http://royale.zerezo.com/zr364xx/
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/zr364xx*
-F:     drivers/media/usb/zr364xx/
+F:     drivers/staging/media/deprecated/zr364xx/
 
 USER-MODE LINUX (UML)
 M:     Richard Weinberger <richard@nod.at>