]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode
authorPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Thu, 14 Mar 2019 13:05:18 +0000 (14:05 +0100)
committerKishon Vijay Abraham I <kishon@ti.com>
Wed, 17 Apr 2019 06:36:02 +0000 (12:06 +0530)
On platforms where the MUSB and HCI controllers share PHY0, PHY passby
is required when using the HCI controller with the PHY, but it must be
disabled when the MUSB controller is used instead.

Without this, PHY0 passby is always enabled, which results in broken
peripheral mode on such platforms (e.g. H3/H5).

Fixes: ba4bdc9e1dc0 ("PHY: sunxi: Add driver for sunxi usb phy")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/allwinner/phy-sun4i-usb.c

index 5163097b43dff1472af1b905936588750d45b9a8..7b23920e0068a453b484a92df84835afe0ec5389 100644 (file)
@@ -551,6 +551,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
        struct sun4i_usb_phy_data *data =
                container_of(work, struct sun4i_usb_phy_data, detect.work);
        struct phy *phy0 = data->phys[0].phy;
+       struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);
        bool force_session_end, id_notify = false, vbus_notify = false;
        int id_det, vbus_det;
 
@@ -607,6 +608,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
                        mutex_unlock(&phy0->mutex);
                }
 
+               /* Enable PHY0 passby for host mode only. */
+               sun4i_usb_phy_passby(phy, !id_det);
+
                /* Re-route PHY0 if necessary */
                if (data->cfg->phy0_dual_route)
                        sun4i_usb_phy0_reroute(data, id_det);