Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7d2729dfb03f9ee5a32eea4621d5c5bb08b0c045..9dce9f10f23ee1d269da3a144cf9c14e8b1d0204 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -56,7 +56,7 @@ R:    Sam Protsenko <joe.skb7@gmail.com>
 S:     Maintained
 F:     cmd/ab_select.c
 F:     common/android_ab.c
-F:     doc/android/ab.txt
+F:     doc/android/ab.rst
 F:     include/android_ab.h
 F:     test/py/tests/test_android/test_ab.py
 
@@ -65,7 +65,7 @@ M:    Igor Opaniuk <igor.opaniuk@gmail.com>
 S:     Maintained
 F:     cmd/avb.c
 F:     common/avb_verify.c
-F:     doc/android/avb2.txt
+F:     doc/android/avb2.rst
 F:     include/avb_verify.h
 F:     lib/libavb/
 F:     test/py/tests/test_android/test_avb.py
@@ -394,7 +394,7 @@ F:  arch/arm/mach-tegra/
 F:     arch/arm/include/asm/arch-tegra*/
 
 ARM TI
-M:     Tom Rini <trini@konsulko.com>
+M:     Lokesh Vutla <lokeshvutla@ti.com>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git
 F:     arch/arm/mach-davinci/
@@ -403,6 +403,14 @@ F: arch/arm/mach-keystone/
 F:     arch/arm/include/asm/arch-omap*/
 F:     arch/arm/include/asm/ti-common/
 
+ARM U8500
+M:     Stephan Gerhold <stephan@gerhold.net>
+R:     Linus Walleij <linus.walleij@linaro.org>
+S:     Maintained
+F:     arch/arm/dts/ste-*
+F:     arch/arm/mach-u8500/
+F:     drivers/timer/nomadik-mtu-timer.c
+
 ARM UNIPHIER
 M:     Masahiro Yamada <yamada.masahiro@socionext.com>
 S:     Maintained
@@ -781,6 +789,15 @@ F: arch/riscv/
 F:     cmd/riscv/
 F:     tools/prelink-riscv.c
 
+RNG
+M:     Sughosh Ganu <sughosh.ganu@linaro.org>
+R:     Heinrich Schuchardt <xypron.glpk@gmx.de>
+S:     Maintained
+F:     cmd/rng.c
+F:     drivers/rng/
+F:     drivers/virtio/virtio_rng.c
+F:     include/rng.h
+
 ROCKUSB
 M:     Eddie Cai <eddie.cai.linux@gmail.com>
 S:     Maintained
@@ -848,6 +865,8 @@ F:  configs/k2g_hs_evm_defconfig
 F:     configs/k2l_hs_evm_defconfig
 F:     configs/am65x_hs_evm_r5_defconfig
 F:     configs/am65x_hs_evm_a53_defconfig
+F:     configs/j721e_hs_evm_r5_defconfig
+F:     configs/j721e_hs_evm_a72_defconfig
 
 TQ GROUP
 #M:    Martin Krause <martin.krause@tq-systems.de>