Merge tag 'pwm/for-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[mirror_ubuntu-eoan-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 73d83416d852639411aa41b2ebef303925bc6e55..9b091ef6579b0f8592e35cac37a4b7889570a347 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
@@ -5911,6 +5911,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 +6591,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
@@ -11906,6 +11921,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 +11941,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