Merge git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7ac7e21ba17a648f676b0d56dd97adb47928a58a..8add9d4c2ae9b5effc5c62c1c27d0ae0d854d1d8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -244,9 +244,12 @@ S: Maintained
 F:     arch/arm/mach-mediatek/
 F:     arch/arm/include/asm/arch-mediatek/
 F:     board/mediatek/
+F:     doc/device-tree-bindings/phy/phy-mtk-*
+F:     doc/device-tree-bindings/usb/mediatek,*
 F:     doc/README.mediatek
 F:     drivers/clk/mediatek/
 F:     drivers/mmc/mtk-sd.c
+F:     drivers/phy/phy-mtk-*
 F:     drivers/pinctrl/mediatek/
 F:     drivers/power/domain/mtk-power-domain.c
 F:     drivers/ram/mediatek/
@@ -272,9 +275,11 @@ M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 S:     Maintained
 F:     arch/arm/include/asm/arch-owl/
 F:     arch/arm/mach-owl/
-F:     board/ucRobotics/
 F:     drivers/clk/owl/
 F:     drivers/serial/serial_owl.c
+F:     include/configs/owl-common.h
+F:     configs/bubblegum_96_defconfig
+F:     configs/cubieboard7_defconfig
 
 ARM RENESAS RMOBILE/R-CAR
 M:     Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
@@ -423,8 +428,33 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git
 F:     arch/arm/mach-davinci/
 F:     arch/arm/mach-k3/
 F:     arch/arm/mach-keystone/
+F:     arch/arm/mach-omap2/
 F:     arch/arm/include/asm/arch-omap*/
 F:     arch/arm/include/asm/ti-common/
+F:     board/ti/
+F:     drivers/dma/ti*
+F:     drivers/firmware/ti_sci.*
+F:     drivers/gpio/omap_gpio.c
+F:     drivers/memory/ti-aemif.c
+F:     drivers/misc/k3_avs.c
+F:     drivers/mailbox/k3-sec-procy.c
+F:     drivers/pci/pcie_dw_ti.c
+F:     drivers/phy/keystone-usb-phy.c
+F:     drivers/phy/omap-usb2-phy.c
+F:     drivers/phy/phy-ti-am654.c
+F:     drivers/phy/ti-pipe3-phy.c
+F:     drivers/ram/k3*
+F:     drivers/remoteproc/k3_system_controller.c
+F:     drivers/remoteproc/ti*
+F:     drivers/reset/reset-ti-sci.c
+F:     drivers/rtc/davinci.c
+F:     drivers/serial/serial_omap.c
+F:     drivers/soc/ti/
+F:     drivers/sysreset/sysreset-ti-sci.c
+F:     drivers/thermal/ti-bandgap.c
+F:     drivers/timer/omap-timer.c
+F:     drivers/watchdog/omap_wdt.c
+F:     include/linux/soc/ti/
 
 ARM U8500
 M:     Stephan Gerhold <stephan@gerhold.net>
@@ -598,12 +628,19 @@ F:        include/asm-generic/pe.h
 F:     lib/charset.c
 F:     lib/efi*/
 F:     test/py/tests/test_efi*
+F:     test/py/tests/test_efi*/
 F:     test/unicode_ut.c
 F:     cmd/bootefi.c
 F:     cmd/efidebug.c
 F:     cmd/nvedit_efi.c
 F:     tools/file2include.c
 
+EFI VARIABLES VIA OP-TEE
+M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
+S:     Maintained
+F:     lib/efi_loader/efi_variable_tee.c
+F:     include/mm_communication.h
+
 ENVIRONMENT
 M:     Joe Hershberger <joe.hershberger@ni.com>
 R:     Wolfgang Denk <wd@denx.de>
@@ -787,7 +824,7 @@ S:  Maintained
 F:     arch/powerpc/
 
 POWERPC MPC8XX
-M:     Christophe Leroy <christophe.leroy@c-s.fr>
+M:     Christophe Leroy <christophe.leroy@csgroup.eu>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc8xx.git
 F:     arch/powerpc/cpu/mpc8xx/