Merge https://source.denx.de/u-boot/custodians/u-boot-usb

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

diff --git a/MAINTAINERS b/MAINTAINERS
index ba9fdb5..b85629d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -121,6 +121,7 @@ F:  arch/arm/include/asm/arch-m1/
 F:     arch/arm/mach-apple/
 F:     configs/apple_m1_defconfig
 F:     drivers/iommu/apple_dart.c
+F:     drivers/nvme/nvme_apple.c
 F:     drivers/pinctrl/pinctrl-apple.c
 F:     drivers/watchdog/apple_wdt.c
 F:     include/configs/apple.h
@@ -348,13 +349,6 @@ S: Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
 F:     drivers/serial/serial_mvebu_a3700.c
 
-ARM MARVELL PXA
-M:     Marek Vasut <marex@denx.de>
-S:     Maintained
-T:     git https://source.denx.de/u-boot/custodians/u-boot-pxa.git
-F:     arch/arm/cpu/pxa/
-F:     arch/arm/include/asm/arch-pxa/
-
 ARM MEDIATEK
 M:     Ryder Lee <ryder.lee@mediatek.com>
 M:     Weijie Gao <weijie.gao@mediatek.com>
@@ -640,6 +634,7 @@ T:  git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/mach-versal/
 F:     drivers/net/xilinx_axi_mrmac.*
 F:     drivers/soc/soc_xilinx_versal.c
+F:     drivers/spi/cadence_ospi_versal.c
 F:     drivers/watchdog/xilinx_wwdt.c
 N:     (?<!uni)versal
 
@@ -832,6 +827,7 @@ F:  test/dm/efi_media.c
 
 EFI PAYLOAD
 M:     Heinrich Schuchardt <xypron.glpk@gmx.de>
+M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-efi.git
 F:     doc/api/efi.rst
@@ -1004,6 +1000,7 @@ F:        drivers/net/xilinx_emaclite.c
 F:     drivers/serial/serial_xuartlite.c
 F:     drivers/spi/xilinx_spi.c
 F:     drivers/sysreset/sysreset_gpio.c
+F:     drivers/timer/xilinx-timer.c
 F:     drivers/watchdog/xilinx_tb_wdt.c
 N:     xilinx
 
@@ -1035,15 +1032,23 @@ R:      GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream@mediatek.com>
 S:     Maintained
 F:     arch/mips/mach-mtmips/
 F:     arch/mips/dts/mt7620.dtsi
+F:     arch/mips/dts/mt7621.dtsi
 F:     arch/mips/dts/mt7620-u-boot.dtsi
+F:     arch/mips/dts/mt7621-u-boot.dtsi
 F:     include/configs/mt7620.h
+F:     include/configs/mt7621.h
 F:     include/dt-bindings/clock/mt7620-clk.h
+F:     include/dt-bindings/clock/mt7621-clk.h
 F:     include/dt-bindings/clock/mt7628-clk.h
 F:     include/dt-bindings/reset/mt7620-reset.h
+F:     include/dt-bindings/reset/mt7621-reset.h
 F:     include/dt-bindings/reset/mt7628-reset.h
 F:     drivers/clk/mtmips/
 F:     drivers/pinctrl/mtmips/
 F:     drivers/gpio/mt7620_gpio.c
+F:     drivers/mtd/nand/raw/mt7621_nand.c
+F:     drivers/mtd/nand/raw/mt7621_nand.h
+F:     drivers/mtd/nand/raw/mt7621_nand_spl.c
 F:     drivers/net/mt7620-eth.c
 F:     drivers/phy/mt7620-usb-phy.c
 F:     drivers/reset/reset-mtmips.c
@@ -1092,8 +1097,9 @@ T:        git https://source.denx.de/u-boot/custodians/u-boot-mmc.git
 F:     drivers/mmc/
 
 NAND FLASH
-#M:    Scott Wood <oss@buserror.net>
-S:     Orphaned (Since 2018-07)
+M:     Dario Binacchi <dario.binacchi@amarulasolutions.com>
+M:     Michael Trimarchi <michael@amarulasolutions.com>
+S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git
 F:     drivers/mtd/nand/raw/
 
@@ -1278,6 +1284,11 @@ F:       drivers/gpio/sl28cpld-gpio.c
 F:     drivers/misc/sl28cpld.c
 F:     drivers/watchdog/sl28cpld-wdt.c
 
+SMCCC TRNG
+M:     Etienne Carriere <etienne.carriere@linaro.org>
+S:     Maintained
+F:     drivers/rng/smccc_trng.c
+
 SPI
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained