MAINTAINERS: Update SH/SoCFPGA/USB email addresses

Update the email addresses to a valid one.
Use N: usb to match on all USB related bits.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

.mailmap

@@ -87,9 +87,10 @@ Love Kumar <love.kumar@amd.com> <love.kumar@xilinx.com>
 Lukasz Majewski <lukma@denx.de>
 Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
 Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
-Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
-Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
-Marek Vasut <marex@denx.de> <marex at denx.de>
+Marek Vasut <marek.vasut+renesas@mailbox.org> <marek.vasut+renesas@gmail.com>
+Marek Vasut <marek.vasut+uboot@mailbox.org> <marek.vasut@gmail.com>
+Marek Vasut <marex@nabladev.com> <marex at denx.de>
+Marek Vasut <marex@nabladev.com> <marex@denx.de>
 Markus Klotzbuecher <mk@denx.de>
 Masahiro Yamada <masahiroy@kernel.org> <yamada.m@jp.panasonic.com>
 Masahiro Yamada <masahiroy@kernel.org> <yamada.masahiro@socionext.com>

MAINTAINERS

@@ -168,7 +168,7 @@ F:	arch/arm/dts/Makefile
 F:	cmd/arm/
 
 ARM ALTERA SOCFPGA
-M:	Marek Vasut <marex@denx.de>
+M:	Marek Vasut <marek.vasut+socfpga@mailbox.org>
 M:	Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
 M:	Tien Fong Chee <tien.fong.chee@altera.com>
 S:	Maintained
@@ -1655,7 +1655,7 @@ F:	cmd/printf.c
 F:	doc/usage/setexpr.rst
 
 SH
-M:	Marek Vasut <marek.vasut+renesas@gmail.com>
+M:	Marek Vasut <marek.vasut+renesas@mailbox.org>
 M:	Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 S:	Maintained
 T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-sh.git
@@ -1869,14 +1869,10 @@ F:	test/boot/upl.c
 F:	test/py/tests/test_upl.py
 
 USB
-M:	Marek Vasut <marex@denx.de>
+M:	Marek Vasut <marek.vasut+usb@mailbox.org>
 S:	Maintained
 T:	git https://git.u-boot-project.org/u-boot/custodians/u-boot-usb.git
-F:	drivers/usb/
-F:	common/usb.c
-F:	common/usb_kbd.c
-F:	common/usb_storage.c
-F:	include/usb.h
+N:	usb
 
 USB TCPM
 M:	Sebastian Reichel <sebastian.reichel@collabora.com>