Merge tag 'tty-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c735e5e2702fd0c0e07995331c89ac2da85a1af..0e01ab35df0426de22b73d480c0f4b3ba7485b64 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -668,6 +668,13 @@ L: linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/media/allegro-dvt/
 
+ALLWINNER CPUFREQ DRIVER
+M:     Yangtao Li <tiny.windzz@gmail.com>
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
+F:     drivers/cpufreq/sun50i-cpufreq-nvmem.c
+
 ALLWINNER SECURITY SYSTEM
 M:     Corentin Labbe <clabbe.montjoie@gmail.com>
 L:     linux-crypto@vger.kernel.org
@@ -1412,6 +1419,14 @@ F:       drivers/pinctrl/sunxi/
 F:     drivers/soc/sunxi/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
 
+Allwinner A10 CSI driver
+M:     Maxime Ripard <mripard@kernel.org>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/platform/sunxi/sun4i-csi/
+F:     Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+S:     Maintained
+
 ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 M:     Neil Armstrong <narmstrong@baylibre.com>
 M:     Jerome Brunet <jbrunet@baylibre.com>
@@ -1462,6 +1477,7 @@ F:        arch/arm/mach-artpec
 F:     arch/arm/boot/dts/artpec6*
 F:     drivers/clk/axis
 F:     drivers/crypto/axis
+F:     drivers/mmc/host/usdhi6rol0.c
 F:     drivers/pinctrl/pinctrl-artpec*
 F:     Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
 
@@ -3781,14 +3797,9 @@ F:       scripts/sign-file.c
 F:     scripts/extract-cert.c
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
-L:     linux-usb@vger.kernel.org
-S:     Orphan
-F:     Documentation/usb/wusb-design-overview.rst
-F:     Documentation/usb/wusb-cbaf
-F:     drivers/usb/host/hwa-hc.c
-F:     drivers/usb/host/whci/
-F:     drivers/usb/wusbcore/
-F:     include/linux/usb/wusb*
+L:     devel@driverdev.osuosl.org
+S:     Obsolete
+F:     drivers/staging/wusbcore/
 
 CFAG12864B LCD DRIVER
 M:     Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
@@ -6269,12 +6280,14 @@ S:      Maintained
 F:     drivers/hwmon/f75375s.c
 F:     include/linux/f75375s.h
 
-FIREWIRE AUDIO DRIVERS
+FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
 M:     Clemens Ladisch <clemens@ladisch.de>
+M:     Takashi Sakamoto <o-takashi@sakamocchi.jp>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 S:     Maintained
 F:     sound/firewire/
+F:     include/uapi/sound/firewire.h
 
 FIREWIRE MEDIA DRIVERS (firedtv)
 M:     Stefan Richter <stefanr@s5r6.in-berlin.de>
@@ -11843,6 +11856,21 @@ T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/i2c/ov5647.c
 
+OMNIVISION OV5670 SENSOR DRIVER
+M:     Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
+M:     Hyungwoo Yang <hyungwoo.yang@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov5670.c
+
+OMNIVISION OV5675 SENSOR DRIVER
+M:     Shawn Tu <shawnx.tu@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov5675.c
+
 OMNIVISION OV5695 SENSOR DRIVER
 M:     Shunqian Zheng <zhengsq@rock-chips.com>
 L:     linux-media@vger.kernel.org
@@ -13285,8 +13313,8 @@ QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 M:     Ilia Lin <ilia.lin@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
-F:     drivers/cpufreq/qcom-cpufreq-kryo.c
+F:     Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
+F:     drivers/cpufreq/qcom-cpufreq-nvmem.c
 
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:     Timur Tabi <timur@kernel.org>
@@ -13744,7 +13772,8 @@ F:      include/linux/hid-roccat*
 F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
 
 ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
-M:     Jacob chen <jacob2.chen@rock-chips.com>
+M:     Jacob Chen <jacob-chen@iotwrt.com>
+M:     Ezequiel Garcia <ezequiel@collabora.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/platform/rockchip/rga/
@@ -13754,7 +13783,7 @@ HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@collabora.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/media/platform/hantro/
+F:     drivers/staging/media/hantro/
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
 
 ROCKER DRIVER
@@ -15505,7 +15534,7 @@ F:      Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 S:     Maintained
-F:     drivers/dma/dwi-axi-dmac/
+F:     drivers/dma/dw-axi-dmac/
 F:     Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
@@ -16466,11 +16495,9 @@ F:     drivers/usb/common/ulpi.c
 F:     include/linux/ulpi/
 
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
-L:     linux-usb@vger.kernel.org
-S:     Orphan
-F:     drivers/uwb/
-F:     include/linux/uwb.h
-F:     include/linux/uwb/
+L:     devel@driverdev.osuosl.org
+S:     Obsolete
+F:     drivers/staging/uwb/
 
 UNICODE SUBSYSTEM:
 M:     Gabriel Krisman Bertazi <krisman@collabora.com>
@@ -17819,14 +17846,6 @@ S:     Maintained
 F:     mm/zpool.c
 F:     include/linux/zpool.h
 
-ZR36067 VIDEO FOR LINUX DRIVER
-L:     mjpeg-users@lists.sourceforge.net
-L:     linux-media@vger.kernel.org
-W:     http://mjpeg.sourceforge.net/driver-zoran/
-T:     hg https://linuxtv.org/hg/v4l-dvb
-S:     Odd Fixes
-F:     drivers/staging/media/zoran/
-
 ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 M:     Minchan Kim <minchan@kernel.org>
 M:     Nitin Gupta <ngupta@vflare.org>