@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
+#include <linux/phy/phy.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/otg-fsm.h>
@@ -1609,10 +1610,15 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)
return 0;
pm_runtime_get_sync(&ci->gadget.dev);
- if (is_on)
+ if (is_on) {
+ if (ci->phy)
+ phy_set_mode(ci->phy, PHY_MODE_USB_DEVICE);
hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
- else
+ } else {
hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
+ if (ci->phy)
+ phy_set_mode(ci->phy, PHY_MODE_USB_HOST);
+ }
pm_runtime_put_sync(&ci->gadget.dev);
return 0;
If the phy supports it, call phy_set_mode() to pull up D+ when required by setting the mode to PHY_MODE_USB_DEVICE. If we want to remove the pullup, set the mode to PHY_MODE_USB_HOST. Cc: Peter Chen <peter.chen@nxp.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> --- drivers/usb/chipidea/udc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.10.0.297.gf6727b0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html