usb: otg: usbps_otg: Automatically setup VBUS

This is zedboard requirement to get otg-host to work.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/usb/otg/xilinx_usbps_otg.c b/drivers/usb/otg/xilinx_usbps_otg.c
index ca287959c8c6d5c84ab9f106291839246f5c36d9..6a45c7f5c2b061932eafe837cfb659c6662c38ab 100644 (file)
--- a/drivers/usb/otg/xilinx_usbps_otg.c
+++ b/drivers/usb/otg/xilinx_usbps_otg.c
@@ -127,6 +127,10 @@ static int xusbps_otg_set_vbus(struct usb_otg *otg, bool enabled)
 
        dev_dbg(xotg->dev, "%s <--- %s\n", __func__, enabled ? "on" : "off");
 
+       /* Enable ulpi VBUS if required */
+       if (xotg->ulpi)
+               otg_set_vbus(xotg->ulpi->otg, enabled);
+
        val = readl(xotg->base + CI_PORTSC1);
 
        if (enabled)
@@ -1939,6 +1943,9 @@ static int xusbps_otg_probe(struct platform_device *pdev)
 
        the_transceiver = xotg;
 
+       /* Setup ulpi phy for OTG */
+       xotg->ulpi = pdata->ulpi;
+
        xotg->otg.otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);
        if (!xotg->otg.otg) {
                kfree(xotg);

diff --git a/include/linux/usb/xilinx_usbps_otg.h b/include/linux/usb/xilinx_usbps_otg.h
index 9b1aaf6add60f0abcd71853ce244b2a474cc4ded..8c360b7a7f935f55333884898474fe67d27a8fc8 100644 (file)
--- a/include/linux/usb/xilinx_usbps_otg.h
+++ b/include/linux/usb/xilinx_usbps_otg.h
@@ -166,6 +166,7 @@ struct otg_hsm {
 
 struct xusbps_otg {
        struct usb_phy          otg;
+       struct usb_phy          *ulpi;
 
        struct otg_hsm          hsm;