From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965022AbcKDQnw (ORCPT ); Fri, 4 Nov 2016 12:43:52 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38129 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964921AbcKDQnq (ORCPT ); Fri, 4 Nov 2016 12:43:46 -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 v4 3/4] usb: musb: Add a quirk flag to skip the phy set mode Date: Fri, 4 Nov 2016 17:43:37 +0100 Message-Id: <1478277818-5091-4-git-send-email-abailon@baylibre.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1478277818-5091-1-git-send-email-abailon@baylibre.com> References: <1478277818-5091-1-git-send-email-abailon@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During the init, the driver will use the mode to configure the controller mode and the phy mode. The PHY of DA8xx has some issues when the phy is forced in host or device. Add way to skip the set mode and let the da8xx glue manage the phy mode. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/musb_core.c | 15 ++++++++++----- drivers/usb/musb/musb_core.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 27dadc0..6f5f039 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2046,6 +2046,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) { int status; struct musb *musb; + enum musb_mode mode = MUSB_UNDEFINED; struct musb_hdrc_platform_data *plat = dev_get_platdata(dev); /* The driver might handle more features than the board; OK. @@ -2261,13 +2262,13 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) status = musb_host_setup(musb, plat->power); if (status < 0) goto fail3; - status = musb_platform_set_mode(musb, MUSB_HOST); + mode = MUSB_HOST; break; case MUSB_PORT_MODE_GADGET: status = musb_gadget_setup(musb); if (status < 0) goto fail3; - status = musb_platform_set_mode(musb, MUSB_PERIPHERAL); + mode = MUSB_PERIPHERAL; break; case MUSB_PORT_MODE_DUAL_ROLE: status = musb_host_setup(musb, plat->power); @@ -2278,15 +2279,19 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb_host_cleanup(musb); goto fail3; } - status = musb_platform_set_mode(musb, MUSB_OTG); + mode = MUSB_OTG; break; default: dev_err(dev, "unsupported port mode %d\n", musb->port_mode); break; } - if (status < 0) - goto fail3; + if (mode != MUSB_UNDEFINED && + !(musb->io.quirks & MUSB_SKIP_SET_MODE)) { + status = musb_platform_set_mode(musb, mode); + if (status < 0) + goto fail3; + } status = musb_init_debugfs(musb); if (status < 0) diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 2cb88a49..9bd8b6b 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -172,6 +172,7 @@ struct musb_io; */ struct musb_platform_ops { +#define MUSB_SKIP_SET_MODE BIT(7) #define MUSB_DMA_UX500 BIT(6) #define MUSB_DMA_CPPI41 BIT(5) #define MUSB_DMA_CPPI BIT(4) -- 2.7.3