Merge tag 'qcom-arm32-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bf77be03fb2b3c3564c497fa1eac1edfd3b9cbca..5d02fbe529c091d2515d76b7dfc71b71354285a0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5378,7 +5378,7 @@ CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
 M:     Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
-M:     Shakeel Butt <shakeelb@google.com>
+M:     Shakeel Butt <shakeel.butt@linux.dev>
 R:     Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
@@ -10476,7 +10476,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
@@ -18858,6 +18859,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>
@@ -20456,12 +20458,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>
@@ -22880,9 +22883,8 @@ S:      Maintained
 F:     drivers/usb/typec/mux/pi3usb30532.c
 
 USB TYPEC PORT CONTROLLER DRIVERS
-M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-usb@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/usb/typec/tcpm/
 
 USB UHCI DRIVER