Merge branch 'lorenzo/pci/rockchip'

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 73d83416d852639411aa41b2ebef303925bc6e55..d70a026ccb84c45bae1abd2c0eca12224afa8d24 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -934,8 +934,8 @@ F:  drivers/char/apm-emulation.c
 APPARMOR SECURITY MODULE
 M:     John Johansen <john.johansen@canonical.com>
 L:     apparmor@lists.ubuntu.com (subscribers-only, general discussion)
-W:     apparmor.wiki.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+W:     wiki.apparmor.net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
 S:     Supported
 F:     security/apparmor/
 F:     Documentation/admin-guide/LSM/apparmor.rst
@@ -2426,7 +2426,6 @@ T:        git git://github.com/ndyer/linux.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 F:     drivers/input/touchscreen/atmel_mxt_ts.c
-F:     include/linux/platform_data/atmel_mxt_ts.h
 
 ATMEL SAMA5D2 ADC DRIVER
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
@@ -5911,6 +5910,11 @@ S:       Supported
 F:     drivers/phy/
 F:     include/linux/phy/
 
+GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/muxes/i2c-demux-pinctrl.c
+
 GENERIC PM DOMAINS
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Kevin Hilman <khilman@kernel.org>
@@ -6586,15 +6590,25 @@ W:      https://i2c.wiki.kernel.org/
 Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/
+F:     Documentation/devicetree/bindings/i2c/i2c.txt
 F:     Documentation/i2c/
-F:     drivers/i2c/
-F:     drivers/i2c/*/
+F:     drivers/i2c/*
 F:     include/linux/i2c.h
-F:     include/linux/i2c-*.h
+F:     include/linux/i2c-dev.h
+F:     include/linux/i2c-smbus.h
 F:     include/uapi/linux/i2c.h
 F:     include/uapi/linux/i2c-*.h
 
+I2C SUBSYSTEM HOST DRIVERS
+L:     linux-i2c@vger.kernel.org
+W:     https://i2c.wiki.kernel.org/
+Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
+S:     Odd Fixes
+F:     Documentation/devicetree/bindings/i2c/
+F:     drivers/i2c/algos/
+F:     drivers/i2c/busses/
+
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -9379,6 +9393,13 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/dvb-frontends/mn88473*
 
+PCI DRIVER FOR MOBIVEIL PCIE IP
+M:     Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
+L:     linux-pci@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
+F:     drivers/pci/host/pcie-mobiveil.c
+
 MODULE SUPPORT
 M:     Jessica Yu <jeyu@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@ -10697,9 +10718,9 @@ F:      Documentation/devicetree/bindings/pci/cdns,*.txt
 F:     drivers/pci/cadence/pcie-cadence*
 
 PCI DRIVER FOR FREESCALE LAYERSCAPE
-M:     Minghuan Lian <minghuan.Lian@freescale.com>
-M:     Mingkai Hu <mingkai.hu@freescale.com>
-M:     Roy Zang <tie-fei.zang@freescale.com>
+M:     Minghuan Lian <minghuan.Lian@nxp.com>
+M:     Mingkai Hu <mingkai.hu@nxp.com>
+M:     Roy Zang <roy.zang@nxp.com>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org
@@ -10926,8 +10947,8 @@ M:      Shawn Lin <shawn.lin@rock-chips.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/rockchip-pcie.txt
-F:     drivers/pci/host/pcie-rockchip.c
+F:     Documentation/devicetree/bindings/pci/rockchip-pcie*
+F:     drivers/pci/host/pcie-rockchip*
 
 PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
 M:     Linus Walleij <linus.walleij@linaro.org>
@@ -11906,6 +11927,11 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git c
 S:     Supported
 F:     drivers/clk/renesas/
 
+RENESAS EMEV2 I2C DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-emev2.c
+
 RENESAS ETHERNET DRIVERS
 R:     Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 L:     netdev@vger.kernel.org
@@ -11921,6 +11947,12 @@ L:     linux-iio@vger.kernel.org
 S:     Supported
 F:     drivers/iio/adc/rcar_gyro_adc.c
 
+RENESAS R-CAR I2C DRIVERS
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-rcar.c
+F:     drivers/i2c/busses/i2c-sh_mobile.c
+
 RENESAS USB PHY DRIVER
 M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 L:     linux-renesas-soc@vger.kernel.org
@@ -12339,6 +12371,7 @@ M:      Tomasz Figa <tomasz.figa@gmail.com>
 M:     Chanwoo Choi <cw00.choi@samsung.com>
 S:     Supported
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
 F:     drivers/clk/samsung/
 F:     include/dt-bindings/clock/exynos*.h
 F:     Documentation/devicetree/bindings/clock/exynos*.txt
@@ -13975,6 +14008,13 @@ F:     arch/arm/mach-davinci/
 F:     drivers/i2c/busses/i2c-davinci.c
 F:     arch/arm/boot/dts/da850*
 
+TI DAVINCI SERIES CLOCK DRIVER
+M:     David Lechner <david@lechnology.com>
+R:     Sekhar Nori <nsekhar@ti.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/ti/davinci/
+F:     drivers/clk/davinci/
+
 TI DAVINCI SERIES GPIO DRIVER
 M:     Keerthy <j-keerthy@ti.com>
 L:     linux-gpio@vger.kernel.org