Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bfb1557..ed22469 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6408,7 +6408,6 @@ L:        linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
 S:     Maintained
 F:     kernel/futex.c
-F:     kernel/futex_compat.c
 F:     include/asm-generic/futex.h
 F:     include/linux/futex.h
 F:     include/uapi/linux/futex.h
@@ -15314,6 +15313,11 @@ M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/spi/spi-tegra*
 
+TEGRA XUSB PADCTL DRIVER
+M:     JC Kuo <jckuo@nvidia.com>
+S:     Supported
+F:     drivers/phy/tegra/xusb*
+
 TEHUTI ETHERNET DRIVER
 M:     Andy Gospodarek <andy@greyhouse.net>
 L:     netdev@vger.kernel.org
@@ -16084,6 +16088,14 @@ L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/roles/intel-xhci-usb-role-switch.c
 
+USB IP DRIVER FOR HISILICON KIRIN
+M:     Yu Chen <chenyu56@huawei.com>
+M:     Binghui Wang <wangbinghui@hisilicon.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
+F:     drivers/phy/hisilicon/phy-hi3660-usb3.c
+
 USB ISP116X DRIVER
 M:     Olav Kongas <ok@artecdesign.ee>
 L:     linux-usb@vger.kernel.org