]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge remote-tracking branch 'phy-next/next' into master
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:22:22 +0000 (12:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Oct 2020 01:22:22 +0000 (12:22 +1100)
# Conflicts:
# MAINTAINERS

1  2 
MAINTAINERS

diff --cc MAINTAINERS
index c0ec5978b65d601a21fd6f62fe4a536bb4c56b23,f01ce8f451c881c754c930f004a9f1c6bbb73d6c..2be1f0f39e7ab210490aa39b75e5efe8b4ea8e3c
@@@ -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>