Merge tag 'armsoc-platforms' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[platform/kernel/linux-rpi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ea81de8..1c767c1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2101,17 +2101,38 @@ F:      arch/arm/mach-pxa/include/mach/z2.h
 ARM/ZTE ARCHITECTURE
 M:     Jun Nie <jun.nie@linaro.org>
 M:     Baoyou Xie <baoyou.xie@linaro.org>
+M:     Shawn Guo <shawnguo@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     arch/arm/boot/dts/zx2967*
 F:     arch/arm/mach-zx/
+F:     arch/arm64/boot/dts/zte/
 F:     drivers/clk/zte/
+F:     drivers/dma/zx_dma.c
+F:     drivers/gpio/gpio-zx.c
+F:     drivers/i2c/busses/i2c-zx2967.c
+F:     drivers/mmc/host/dw_mmc-zx.*
+F:     drivers/pinctrl/zte/
 F:     drivers/reset/reset-zx2967.c
 F:     drivers/soc/zte/
+F:     drivers/thermal/zx2967_thermal.c
+F:     drivers/watchdog/zx2967_wdt.c
 F:     Documentation/devicetree/bindings/arm/zte.txt
-F:     Documentation/devicetree/bindings/clock/zx296702-clk.txt
+F:     Documentation/devicetree/bindings/clock/zx2967*.txt
+F:     Documentation/devicetree/bindings/dma/zxdma.txt
+F:     Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
+F:     Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
+F:     Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 F:     Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 F:     Documentation/devicetree/bindings/soc/zte/
-F:     include/dt-bindings/soc/zx*.h
+F:     Documentation/devicetree/bindings/sound/zte,*.txt
+F:     Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
+F:     Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
+F:     include/dt-bindings/clock/zx2967*.h
+F:     include/dt-bindings/soc/zte,*.h
+F:     sound/soc/codecs/zx_aud96p22.c
+F:     sound/soc/zte/
 
 ARM/ZYNQ ARCHITECTURE
 M:     Michal Simek <michal.simek@xilinx.com>
@@ -3175,6 +3196,7 @@ S:        Supported
 F:     drivers/crypto/cavium/cpt/
 
 CAVIUM THUNDERX2 ARM64 SOC
+M:     Robert Richter <rrichter@cavium.com>
 M:     Jayachandran C <jnair@caviumnetworks.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained