Merge git://git.linuxtv.org/media_stage into media_tree

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f4fe807..7f4678d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2872,7 +2872,7 @@ M:        Marek Szyprowski <m.szyprowski@samsung.com>
 L:     linux-samsung-soc@vger.kernel.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/s5p-cec.txt
+F:     Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
 F:     drivers/media/cec/platform/s5p/
 
 ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
@@ -3005,7 +3005,7 @@ M:        Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-tegra@vger.kernel.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/tegra-cec.txt
+F:     Documentation/devicetree/bindings/media/cec/nvidia,tegra114-cec.yaml
 F:     drivers/media/cec/platform/tegra/
 
 ARM/TESLA FSD SoC SUPPORT
@@ -3228,7 +3228,7 @@ M:        Tianshu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/ak7375.txt
+F:     Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
 F:     drivers/media/i2c/ak7375.c
 
 ASAHI KASEI AK8974 DRIVER
@@ -4837,7 +4837,7 @@ S:        Supported
 W:     http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/ABI/testing/debugfs-cec-error-inj
-F:     Documentation/devicetree/bindings/media/cec.txt
+F:     Documentation/devicetree/bindings/media/cec/cec-common.yaml
 F:     Documentation/driver-api/media/cec-core.rst
 F:     Documentation/userspace-api/media/cec
 F:     drivers/media/cec/
@@ -4853,7 +4853,7 @@ L:        linux-media@vger.kernel.org
 S:     Supported
 W:     http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/cec-gpio.txt
+F:     Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
 F:     drivers/media/cec/platform/cec-gpio/
 
 CELL BROADBAND ENGINE ARCHITECTURE
@@ -13572,7 +13572,7 @@ L:      linux-amlogic@lists.infradead.org
 S:     Supported
 W:     http://linux-meson.com/
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+F:     Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
 F:     drivers/media/cec/platform/meson/ao-cec-g12a.c
 F:     drivers/media/cec/platform/meson/ao-cec.c
 
@@ -15467,6 +15467,7 @@ M:      Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov5670.yaml
 F:     drivers/media/i2c/ov5670.c
 
 OMNIVISION OV5675 SENSOR DRIVER
@@ -15474,6 +15475,7 @@ M:      Shawn Tu <shawnx.tu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov5675.yaml
 F:     drivers/media/i2c/ov5675.c
 
 OMNIVISION OV5693 SENSOR DRIVER
@@ -15523,6 +15525,15 @@ T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/ov8856.yaml
 F:     drivers/media/i2c/ov8856.c
 
+OMNIVISION OV8858 SENSOR DRIVER
+M:     Jacopo Mondi <jacopo.mondi@ideasonboard.com>
+M:     Nicholas Roth <nicholas@rothemail.net>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
+F:     drivers/media/i2c/ov8858.c
+
 OMNIVISION OV9282 SENSOR DRIVER
 M:     Paul J. Murphy <paul.j.murphy@intel.com>
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@ -18403,7 +18414,9 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/staging/media/deprecated/saa7146/
+F:     drivers/media/common/saa7146/
+F:     drivers/media/pci/saa7146/
+F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
 M:     Micah Morton <mortonm@chromium.org>
@@ -19472,6 +19485,15 @@ T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
 F:     drivers/media/i2c/imx290.c
 
+SONY IMX296 SENSOR DRIVER
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
+F:     drivers/media/i2c/imx296.c
+
 SONY IMX319 SENSOR DRIVER
 M:     Bingbu Cao <bingbu.cao@intel.com>
 L:     linux-media@vger.kernel.org
@@ -19513,6 +19535,14 @@ T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
 F:     drivers/media/i2c/imx412.c
 
+SONY IMX415 SENSOR DRIVER
+M:     Michael Riesch <michael.riesch@wolfvision.net>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml
+F:     drivers/media/i2c/imx415.c
+
 SONY MEMORYSTICK SUBSYSTEM
 M:     Maxim Levitsky <maximlevitsky@gmail.com>
 M:     Alex Dubov <oakad@yahoo.com>
@@ -19951,7 +19981,7 @@ F:      sound/soc/sti/
 STI CEC DRIVER
 M:     Alain Volmat <alain.volmat@foss.st.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/stih-cec.txt
+F:     Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
 F:     drivers/media/cec/platform/sti/
 
 STK1160 USB VIDEO CAPTURE DRIVER