From: Stephen Boyd <stephen.boyd@linaro.org> To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross <andy.gross@linaro.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Neil Armstrong <narmstrong@baylibre.com>, Arnd Bergmann <arnd@arndb.de>, Felipe Balbi <balbi@kernel.org>, Peter Chen <peter.chen@nxp.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: [PATCH v4 06/22] usb: chipidea: Add platform flag for wrapper phy management Date: Wed, 7 Sep 2016 14:35:03 -0700 [thread overview] Message-ID: <20160907213519.27340-7-stephen.boyd@linaro.org> (raw) In-Reply-To: <20160907213519.27340-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
WARNING: multiple messages have this Message-ID (diff)
From: stephen.boyd@linaro.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 06/22] usb: chipidea: Add platform flag for wrapper phy management Date: Wed, 7 Sep 2016 14:35:03 -0700 [thread overview] Message-ID: <20160907213519.27340-7-stephen.boyd@linaro.org> (raw) In-Reply-To: <20160907213519.27340-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-07 21:35 UTC|newest] Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-07 21:34 [PATCH v4 00/22] Support qcom's HSIC USB and rewrite USB2 HS support Stephen Boyd 2016-09-07 21:34 ` Stephen Boyd 2016-09-07 21:34 ` [PATCH v4 02/22] of: device: Export of_device_{get_modalias, uvent_modalias} to modules Stephen Boyd 2016-09-07 21:34 ` Stephen Boyd 2016-09-07 21:34 ` [PATCH v4 02/22] of: device: Export of_device_{get_modalias,uvent_modalias} " Stephen Boyd 2016-09-08 0:58 ` Rob Herring 2016-09-08 0:58 ` [PATCH v4 02/22] of: device: Export of_device_{get_modalias, uvent_modalias} " Rob Herring 2016-09-08 0:58 ` [PATCH v4 02/22] of: device: Export of_device_{get_modalias,uvent_modalias} " Rob Herring 2016-09-07 21:35 ` [PATCH v4 03/22] usb: ulpi: Support device discovery via DT Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd [not found] ` <20160907213519.27340-4-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-09-08 1:12 ` Rob Herring 2016-09-08 1:12 ` Rob Herring 2016-09-08 1:12 ` Rob Herring 2016-09-08 1:54 ` Stephen Boyd 2016-09-08 1:54 ` Stephen Boyd 2016-09-12 22:05 ` Stephen Boyd 2016-09-12 22:05 ` Stephen Boyd 2016-09-12 22:05 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 04/22] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 05/22] usb: chipidea: Handle extcon events properly Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd [this message] 2016-09-07 21:35 ` [PATCH v4 06/22] usb: chipidea: Add platform flag for wrapper phy management Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 07/22] usb: chipidea: Notify events when switching host mode Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 08/22] usb: chipidea: Remove locking in ci_udc_start() Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 09/22] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 10/22] usb: chipidea: Consolidate extcon notifiers Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-08 1:23 ` Peter Chen 2016-09-08 1:23 ` Peter Chen 2016-09-07 21:35 ` [PATCH v4 12/22] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 15/22] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 18/22] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 19/22] usb: chipidea: msm: Handle phy power states Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd [not found] ` <20160907213519.27340-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-09-07 21:34 ` [PATCH v4 01/22] of: device: Support loading a module with OF based modalias Stephen Boyd 2016-09-07 21:34 ` Stephen Boyd 2016-09-07 21:34 ` Stephen Boyd 2016-09-08 0:58 ` Rob Herring 2016-09-08 0:58 ` Rob Herring 2016-09-08 0:58 ` Rob Herring 2016-09-07 21:35 ` [PATCH v4 11/22] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 14/22] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 16/22] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 17/22] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 20/22] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` [PATCH v4 21/22] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-16 14:21 ` Rob Herring 2016-09-16 14:21 ` Rob Herring 2016-09-07 21:35 ` [PATCH v4 22/22] phy: Add support for Qualcomm's USB HS phy Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-07 21:35 ` Stephen Boyd 2016-09-13 7:03 ` Peter Chen 2016-09-13 7:03 ` Peter Chen 2016-09-13 20:41 ` Stephen Boyd 2016-09-13 20:41 ` Stephen Boyd 2016-09-14 2:11 ` Peter Chen 2016-09-14 2:11 ` Peter Chen 2016-09-14 2:11 ` Peter Chen 2016-09-14 6:29 ` Stephen Boyd 2016-09-14 6:29 ` Stephen Boyd 2016-09-14 9:33 ` Peter Chen 2016-09-14 9:33 ` Peter Chen 2016-09-14 17:42 ` Stephen Boyd 2016-09-14 17:42 ` Stephen Boyd 2016-09-15 5:29 ` Peter Chen 2016-09-15 5:29 ` Peter Chen [not found] ` <20160910121857.GB11271@a0393678ub> 2016-09-14 5:29 ` Kishon Vijay Abraham I 2016-09-14 5:29 ` Kishon Vijay Abraham I 2016-09-14 5:29 ` Kishon Vijay Abraham I 2016-09-16 15:19 ` Rob Herring 2016-09-16 15:19 ` Rob Herring 2016-09-17 0:05 ` Stephen Boyd 2016-09-17 0:05 ` Stephen Boyd 2016-09-19 21:01 ` Rob Herring 2016-09-19 21:01 ` Rob Herring 2016-09-19 21:01 ` Rob Herring 2016-09-08 2:06 ` [PATCH v4 00/22] Support qcom's HSIC USB and rewrite USB2 HS support Peter Chen 2016-09-08 2:06 ` Peter Chen 2016-09-08 2:06 ` Peter Chen 2016-09-08 21:13 ` Stephen Boyd 2016-09-08 21:13 ` Stephen Boyd 2016-09-09 0:45 ` Peter Chen 2016-09-09 0:45 ` Peter Chen 2016-09-09 0:45 ` Peter Chen
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=20160907213519.27340-7-stephen.boyd@linaro.org \ --to=stephen.boyd@linaro.org \ --cc=andy.gross@linaro.org \ --cc=arnd@arndb.de \ --cc=balbi@kernel.org \ --cc=bjorn.andersson@linaro.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=narmstrong@baylibre.com \ --cc=peter.chen@nxp.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.