When musb->xceiv is not provided but musb->phy is, support setting the
OTG mode (host, peripheral) using the generic PHY framework.

Signed-off-by: Paul Cercueil <[email protected]>
---
 drivers/usb/musb/musb_gadget.c | 4 ++++
 drivers/usb/musb/musb_host.c   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index f3592c7a5c5e..3cfbd7990e92 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1849,6 +1849,8 @@ static int musb_gadget_start(struct usb_gadget *g,
 
        if (musb->xceiv)
                otg_set_peripheral(musb->xceiv->otg, &musb->g);
+       else
+               phy_set_mode(musb->phy, PHY_MODE_USB_DEVICE);
 
        musb_set_state(musb, OTG_STATE_B_IDLE);
        spin_unlock_irqrestore(&musb->lock, flags);
@@ -1900,6 +1902,8 @@ static int musb_gadget_stop(struct usb_gadget *g)
 
        if (musb->xceiv)
                otg_set_peripheral(musb->xceiv->otg, NULL);
+       else
+               phy_set_mode(musb->phy, PHY_MODE_INVALID);
 
        musb->is_active = 0;
        musb->gadget_driver = NULL;
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index d8793f8df25c..f53968ad9187 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2732,6 +2732,8 @@ int musb_host_setup(struct musb *musb, int power_budget)
        if (musb->xceiv) {
                otg_set_host(musb->xceiv->otg, &hcd->self);
                musb->xceiv->otg->host = &hcd->self;
+       } else {
+               phy_set_mode(musb->phy, PHY_MODE_USB_HOST);
        }
 
        /* don't support otg protocols */
-- 
2.29.2

Reply via email to