From: stephen.boyd@linaro.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 06/22] usb: chipidea: Add platform flag for wrapper phy management
Date: Wed, 31 Aug 2016 17:40:20 -0700 [thread overview]
Message-ID: <20160901004036.23936-7-stephen.boyd@linaro.org> (raw)
In-Reply-To: <20160901004036.23936-1-stephen.boyd@linaro.org>
The ULPI phy on qcom platforms needs to be initialized and
powered on after a USB reset and before we toggle the run/stop
bit. Otherwise, the phy locks up and doesn't work properly.
Therefore, add a flag to skip any phy power management in the
core layer, leaving it up to the glue driver to manage.
Acked-by: 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/core.c | 6 ++++++
include/linux/usb/chipidea.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 01390e02ee53..532085a096d9 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -361,6 +361,9 @@ static int _ci_usb_phy_init(struct ci_hdrc *ci)
*/
static void ci_usb_phy_exit(struct ci_hdrc *ci)
{
+ if (ci->platdata->flags & CI_HDRC_OVERRIDE_PHY_CONTROL)
+ return;
+
if (ci->phy) {
phy_power_off(ci->phy);
phy_exit(ci->phy);
@@ -379,6 +382,9 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
{
int ret;
+ if (ci->platdata->flags & CI_HDRC_OVERRIDE_PHY_CONTROL)
+ return 0;
+
switch (ci->platdata->phy_mode) {
case USBPHY_INTERFACE_MODE_UTMI:
case USBPHY_INTERFACE_MODE_UTMIW:
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index f9be467d6695..d07b162073f7 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -57,6 +57,7 @@ struct ci_hdrc_platform_data {
#define CI_HDRC_OVERRIDE_AHB_BURST BIT(9)
#define CI_HDRC_OVERRIDE_TX_BURST BIT(10)
#define CI_HDRC_OVERRIDE_RX_BURST BIT(11)
+#define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */
enum usb_dr_mode dr_mode;
#define CI_HDRC_CONTROLLER_RESET_EVENT 0
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
--
2.9.0.rc2.8.ga28705d
next prev parent reply other threads:[~2016-09-01 0:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-01 0:40 [PATCH v3 00/22] Support qcom's HSIC USB and rewrite USB2 HS phy support Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 01/22] of: device: Support loading a module with OF based modalias Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 02/22] of: device: Export of_device_{get_modalias, uvent_modalias} to modules Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 03/22] usb: ulpi: Support device discovery via device properties Stephen Boyd
2016-09-02 14:09 ` Heikki Krogerus
2016-09-03 1:14 ` Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 04/22] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd
2016-09-02 2:43 ` Peter Chen
2016-09-01 0:40 ` [PATCH v3 05/22] usb: chipidea: Handle extcon events properly Stephen Boyd
2016-09-01 0:40 ` Stephen Boyd [this message]
2016-09-01 0:40 ` [PATCH v3 07/22] usb: chipidea: Notify events when switching host mode Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 08/22] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 09/22] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd
2016-09-02 2:47 ` Peter Chen
2016-09-01 0:40 ` [PATCH v3 10/22] usb: chipidea: Consolidate extcon notifiers Stephen Boyd
2016-09-02 3:17 ` Peter Chen
2016-09-03 1:03 ` Stephen Boyd
2016-09-05 2:39 ` Peter Chen
2016-09-06 17:48 ` Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 11/22] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 12/22] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 14/22] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 15/22] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 16/22] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 17/22] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 18/22] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd
2016-09-02 3:33 ` Peter Chen
2016-09-01 0:40 ` [PATCH v3 19/22] usb: chipidea: msm: Handle phy power states Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 20/22] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd
2016-09-01 0:40 ` [PATCH v3 21/22] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd
2016-09-01 6:17 ` Vivek Gautam
2016-09-01 22:00 ` Stephen Boyd
2016-09-02 11:28 ` vivek.gautam at codeaurora.org
2016-09-01 0:40 ` [PATCH v3 22/22] phy: Add support for Qualcomm's USB HS phy Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160901004036.23936-7-stephen.boyd@linaro.org \
--to=stephen.boyd@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).