diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-29 13:19:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-29 13:19:54 +1100 |
| commit | ca3b9534c0c25b98c35edb45a71941bc76da8048 (patch) | |
| tree | df9fc613fdf76faa72b207d678b825aabdfbb5e2 | |
| parent | 94451c280117e79c76912fc8836eefedaecfc21f (diff) | |
| parent | c36f74566cef6b2a377c8830ee216677ddb12706 (diff) | |
Merge remote-tracking branch 'phy-next/next' into master
# Conflicts:
# MAINTAINERS
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0e8f57817184..d8bced1b09fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14552,6 +14552,14 @@ F: Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml 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> diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c index 62d6d6849ad6..47a0c09bc9fa 100644 --- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c +++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c @@ -131,7 +131,7 @@ static const struct phy_ops imx8mq_usb_phy_ops = { .owner = THIS_MODULE, }; -static struct phy_ops imx8mp_usb_phy_ops = { +static const struct phy_ops imx8mp_usb_phy_ops = { .init = imx8mp_usb_phy_init, .power_on = imx8mq_phy_power_on, .power_off = imx8mq_phy_power_off, |