From patchwork Sun Mar 17 18:23:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grazvydas Ignotas X-Patchwork-Id: 2284281 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9F74FE00DD for ; Sun, 17 Mar 2013 18:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932771Ab3CQSX6 (ORCPT ); Sun, 17 Mar 2013 14:23:58 -0400 Received: from mail-ea0-f175.google.com ([209.85.215.175]:53696 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932689Ab3CQSXy (ORCPT ); Sun, 17 Mar 2013 14:23:54 -0400 Received: by mail-ea0-f175.google.com with SMTP id o10so2196232eaj.20 for ; Sun, 17 Mar 2013 11:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=anROKgStZIkCT3JQsNXBjofDp6CmnSvTH7g1fUk6U68=; b=lQRCbm9jxAIBhlElBBv8/yFcOzaNxEV29DTVEO7J7ssb6JHWZ1ilWhnyTtjuKsDUlU WIigLMQf23M5ibv83f6iTG9xUsKLHRDZ/1ZB/f87CpFgoRIejDj9aWO6ghvCWqBAPEOU h7rmzBUExI8jX3A8oekvZOG5MJuB8GxzSIu/gvttUZYA17gNw/nBJga4YJ9lrKIhXgfo NikoMnkZwSwIsCTvUG5Nw1XlhEud4mKAKvLLe62f2o/6aVV5N+kvLtNSiOzgx6oM5ZYc l0zOe938XZL18LrkJxKv5Aw2ZO/0nNYSxfwzeoEcH3mWcU0aCJKC1mOTawhR8TuVA4Fg HsAQ== X-Received: by 10.14.1.130 with SMTP id 2mr40715328eed.15.1363544633088; Sun, 17 Mar 2013 11:23:53 -0700 (PDT) Received: from localhost.localdomain (ip-88-119-226-136.static.b4net.lt. [88.119.226.136]) by mx.google.com with ESMTPS id a1sm22724358eep.2.2013.03.17.11.23.51 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Mar 2013 11:23:52 -0700 (PDT) From: Grazvydas Ignotas To: linux-usb@vger.kernel.org Cc: linux-omap@vger.kernel.org, Felipe Balbi , NeilBrown , kishon , Grazvydas Ignotas Subject: [PATCHv2 7/7] usb: musb: gadget: use platform callback to enable vbus Date: Sun, 17 Mar 2013 20:23:27 +0200 Message-Id: <1363544607-17634-8-git-send-email-notasas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363544607-17634-1-git-send-email-notasas@gmail.com> References: <1363544607-17634-1-git-send-email-notasas@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On some platform configurations (like OMAP3+twl4030) it's the platform code that enables VBUS, not OTG transceiver, so call vbus platform callback instead, it will then call the transceiver if needed. This fixes a use case where USB cable is plugged first and gadget driver is loaded later after that. Signed-off-by: Grazvydas Ignotas --- drivers/usb/musb/musb_gadget.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index ae59ee6..60eef20 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1799,9 +1799,8 @@ static int musb_gadget_start(struct usb_gadget *g, goto err; } - if ((musb->xceiv->last_event == USB_EVENT_ID) - && otg->set_vbus) - otg_set_vbus(otg, 1); + if (musb->xceiv->last_event == USB_EVENT_ID) + musb_platform_set_vbus(musb, 1); hcd->self.uses_pio_for_control = 1;