Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932345AbcKCP1K (ORCPT ); Thu, 3 Nov 2016 11:27:10 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37584 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758119AbcKCP0R (ORCPT ); Thu, 3 Nov 2016 11:26:17 -0400 From: Alexandre Bailon To: david@lechnology.com, b-liu@ti.com, balbi@kernel.org Cc: kishon@ti.com, khilman@baylibre.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, nsekhar@ti.com, Alexandre Bailon Subject: [PATCH v3 5/5] usb: musb: da8xx: Remove set_mode callback Date: Thu, 3 Nov 2016 16:26:05 +0100 Message-Id: <1478186765-19840-6-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1478186765-19840-1-git-send-email-abailon@baylibre.com> References: <1478186765-19840-1-git-send-email-abailon@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2221 Lines: 65 The USB PHY is able to operate in OTG, host or peripheral. Some board may be wired to work act only as host or peripheral. In such case, the dr_mode property of controller must be set to host or peripheral. But doing that will also configure the PHY in host or peripheral mode whereas OTG is able to detect which role the USB controller should take. The PHY's host or peripheral mode are actually only useful when hardware doesn't allow OTG to detect it's role. The set_mode callback is used by the musb driver to set mode of the PHY. But in the case of DA8xx, the PHY have some issues. The OTG mode work correctly but the host and peripheral don't. In host mode, the PHY stops to work after the first disconnect. In device mode, the PHY doesn't detect any disconnect. As the OTG mode is working properly, let the PHY in OTG mode, whatever is the controller mode. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/da8xx.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 6749aa1..581f830 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -335,28 +335,6 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) return ret; } -static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode) -{ - struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent); - enum phy_mode phy_mode; - - switch (musb_mode) { - case MUSB_HOST: /* Force VBUS valid, ID = 0 */ - phy_mode = PHY_MODE_USB_HOST; - break; - case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */ - phy_mode = PHY_MODE_USB_DEVICE; - break; - case MUSB_OTG: /* Don't override the VBUS/ID comparators */ - phy_mode = PHY_MODE_USB_OTG; - break; - default: - return -EINVAL; - } - - return phy_set_mode(glue->phy, phy_mode); -} - static int da8xx_musb_init(struct musb *musb) { struct da8xx_glue *glue = dev_get_drvdata(musb->controller->parent); @@ -445,7 +423,6 @@ static const struct musb_platform_ops da8xx_ops = { .enable = da8xx_musb_enable, .disable = da8xx_musb_disable, - .set_mode = da8xx_musb_set_mode, .try_idle = da8xx_musb_try_idle, .set_vbus = da8xx_musb_set_vbus, -- 2.7.3