From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Oct 2020 01:22:22 +0000 (+1100)
Subject: Merge remote-tracking branch 'phy-next/next' into master
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a708d5298971bb4f1dcceb14a3f3d5c3400d5f7f;p=users%2Fhch%2Fblock.git

Merge remote-tracking branch 'phy-next/next' into master

# Conflicts:
#	MAINTAINERS
---

a708d5298971bb4f1dcceb14a3f3d5c3400d5f7f
diff --cc MAINTAINERS
index c0ec5978b65d,f01ce8f451c8..2be1f0f39e7a
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14568,14 -14547,14 +14568,22 @@@ F:	Documentation/devicetree/bindings/ma
  F:	drivers/mailbox/qcom-ipcc.c
  F:	include/dt-bindings/mailbox/qcom-ipcc.h
  
+ QUALCOMM IPQ4019 USB PHY DRIVER
+ M:	Robert Marko <robert.marko@sartura.hr>
+ M:	Luka Perkov <luka.perkov@sartura.hr>
+ L:	linux-arm-msm@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml
+ F:	drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
+ 
 +QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
 +M:	Robert Marko <robert.marko@sartura.hr>
 +M:	Luka Perkov <luka.perkov@sartura.hr>
 +L:	linux-arm-msm@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
 +F:	drivers/regulator/vqmmc-ipq4019-regulator.c
 +
  QUALCOMM RMNET DRIVER
  M:	Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
  M:	Sean Tranchetti <stranche@codeaurora.org>