Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c1543f..dd92af5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -272,9 +272,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 +425,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>
@@ -447,6 +474,7 @@ M:  Michal Simek <michal.simek@xilinx.com>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/mach-versal/
+F:     drivers/watchdog/xilinx_wwdt.c
 N:     (?<!uni)versal
 
 ARM VERSATILE EXPRESS DRIVERS
@@ -527,6 +555,13 @@ M: Simon Glass <sjg@chromium.org>
 S:     Maintained
 F:     tools/binman/
 
+BTRFS
+M:     Marek Behun <marek.behun@nic.cz>
+S:     Maintained
+F:     cmd/btrfs.c
+F:     fs/btrfs/
+F:     include/btrfs.h
+
 BUILDMAN
 M:     Simon Glass <sjg@chromium.org>
 S:     Maintained
@@ -646,9 +681,9 @@ LOGGING
 M:     Simon Glass <sjg@chromium.org>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/u-boot.git
-F:     common/log.c
+F:     common/log*
 F:     cmd/log.c
-F:     test/log/log_test.c
+F:     test/log/
 F:     test/py/tests/test_log.py
 
 MALI DISPLAY PROCESSORS