Merge tag 'soc-dt-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 747f492ce6ccd8b2223219b2a8fbe58e055cdd92..92c9563f4256ef4f265de2e312c618e0eb4cef36 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -897,6 +897,12 @@ Q: https://patchwork.kernel.org/project/linux-rdma/list/
 F:     drivers/infiniband/hw/efa/
 F:     include/uapi/rdma/efa-abi.h
 
+AMD ADDRESS TRANSLATION LIBRARY (ATL)
+M:     Yazen Ghannam <Yazen.Ghannam@amd.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
+F:     drivers/ras/amd/atl/*
+
 AMD AXI W1 DRIVER
 M:     Kris Chaplin <kris.chaplin@amd.com>
 R:     Thomas Delev <thomas.delev@amd.com>
@@ -7583,7 +7589,6 @@ R:        Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
-F:     Documentation/admin-guide/ras.rst
 F:     Documentation/driver-api/edac.rst
 F:     drivers/edac/
 F:     include/linux/edac.h
@@ -10477,7 +10482,8 @@ M:      Donald Robson <donald.robson@imgtec.com>
 M:     Matt Coster <matt.coster@imgtec.com>
 S:     Supported
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/gpu/img,powervr.yaml
+F:     Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
+F:     Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
 F:     Documentation/gpu/imagination/
 F:     drivers/gpu/drm/imagination/
 F:     include/uapi/drm/pvr_drm.h
@@ -18379,11 +18385,17 @@ M:    Tony Luck <tony.luck@intel.com>
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
-F:     Documentation/admin-guide/ras.rst
+F:     Documentation/admin-guide/RAS
 F:     drivers/ras/
 F:     include/linux/ras.h
 F:     include/ras/ras_event.h
 
+RAS FRU MEMORY POISON MANAGER (FMPM)
+M:     Yazen Ghannam <Yazen.Ghannam@amd.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/ras/amd/fmpm.c
+
 RC-CORE / LIRC FRAMEWORK
 M:     Sean Young <sean@mess.org>
 L:     linux-media@vger.kernel.org
@@ -18873,6 +18885,7 @@ F:      Documentation/devicetree/bindings/riscv/
 F:     arch/riscv/boot/dts/
 X:     arch/riscv/boot/dts/allwinner/
 X:     arch/riscv/boot/dts/renesas/
+X:     arch/riscv/boot/dts/sophgo/
 
 RISC-V PMU DRIVERS
 M:     Atish Patra <atishp@atishpatra.org>
@@ -20451,12 +20464,13 @@ F:    drivers/char/sonypi.c
 F:     drivers/platform/x86/sony-laptop.c
 F:     include/linux/sony-laptop.h
 
-SOPHGO DEVICETREES
-M:     Chao Wei <chao.wei@sophgo.com>
+SOPHGO DEVICETREES and DRIVERS
 M:     Chen Wang <unicorn_wang@outlook.com>
+M:     Inochi Amaoto <inochiama@outlook.com>
+T:     git https://github.com/sophgo/linux.git
 S:     Maintained
-F:     arch/riscv/boot/dts/sophgo/
-F:     Documentation/devicetree/bindings/riscv/sophgo.yaml
+N:     sophgo
+K:     sophgo
 
 SOUND
 M:     Jaroslav Kysela <perex@perex.cz>