Merge tag 'at24-4.17-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.17

"three new special cases for device tree compatible strings"

1 files changed, 28 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c5a2d0e993a..2d3f847cdc8d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1238,7 +1238,7 @@ F:	drivers/clk/at91
 
 ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 M:      Nicolas Ferre <nicolas.ferre@microchip.com>
-M:      Alexandre Belloni <alexandre.belloni@free-electrons.com>
+M:      Alexandre Belloni <alexandre.belloni@bootlin.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.linux4sam.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
@@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
 M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-M:      Gregory Clement <gregory.clement@free-electrons.com>
+M:      Gregory Clement <gregory.clement@bootlin.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      Documentation/devicetree/bindings/soc/dove/
@@ -1604,7 +1604,7 @@ F:	arch/arm/boot/dts/orion5x*
 ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
-M:      Gregory Clement <gregory.clement@free-electrons.com>
+M:      Gregory Clement <gregory.clement@bootlin.com>
 M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -1999,8 +1999,10 @@ M:	Maxime Coquelin <mcoquelin.stm32@gmail.com>
 M:      Alexandre Torgue <alexandre.torgue@st.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
 N:      stm32
+F:      arch/arm/boot/dts/stm32*
+F:      arch/arm/mach-stm32/
 F:      drivers/clocksource/armv7m_systick.c
 
 ARM/TANGO ARCHITECTURE
@@ -7600,8 +7602,10 @@ F:	mm/kasan/
 F:      scripts/Makefile.kasan
 
 KCONFIG
+M:      Masahiro Yamada <yamada.masahiro@socionext.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
 L:      linux-kbuild@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      Documentation/kbuild/kconfig-language.txt
 F:      scripts/kconfig/
 
@@ -9921,6 +9925,13 @@ F:	Documentation/ABI/stable/sysfs-bus-nvmem
 F:      include/linux/nvmem-consumer.h
 F:      include/linux/nvmem-provider.h
 
+NXP SGTL5000 DRIVER
+M:      Fabio Estevam <fabio.estevam@nxp.com>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Maintained
+F:      Documentation/devicetree/bindings/sound/sgtl5000.txt
+F:      sound/soc/codecs/sgtl5000*
+
 NXP TDA998X DRM DRIVER
 M:      Russell King <linux@armlinux.org.uk>
 S:      Supported
@@ -10926,6 +10937,17 @@ L:	linux-gpio@vger.kernel.org
 S:      Supported
 F:      drivers/pinctrl/pinctrl-at91-pio4.*
 
+PIN CONTROLLER - FREESCALE
+M:      Dong Aisheng <aisheng.dong@nxp.com>
+M:      Fabio Estevam <festevam@gmail.com>
+M:      Shawn Guo <shawnguo@kernel.org>
+M:      Stefan Agner <stefan@agner.ch>
+R:      Pengutronix Kernel Team <kernel@pengutronix.de>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/pinctrl/freescale/
+F:      Documentation/devicetree/bindings/pinctrl/fsl,*
+
 PIN CONTROLLER - INTEL
 M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:      Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@ -12092,6 +12114,7 @@ M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/samsung/
+F:      Documentation/devicetree/bindings/sound/samsung*
 
 SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 M:      Krzysztof Kozlowski <krzk@kernel.org>