From: Peter Chen <hzpeterchen@gmail.com> To: Stephen Boyd <stephen.boyd@linaro.org> Cc: linux-usb@vger.kernel.org, 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: Re: [PATCH 14/21] usb: chipidea: msm: Add proper clk and reset support Date: Wed, 29 Jun 2016 15:02:12 +0800 [thread overview] Message-ID: <20160629070212.GI25236@shlinux2> (raw) In-Reply-To: <20160626072838.28082-15-stephen.boyd@linaro.org> On Sun, Jun 26, 2016 at 12:28:31AM -0700, Stephen Boyd wrote: > The msm chipidea controller uses two main clks, an AHB clk to > read/write the MMIO registers and a core clk called the system > clk that drives the controller itself. Add support for these clks > as they're required in all designs. > > Also add support for an optional third clk that we need to turn > on to read/write the ULPI phy registers. Some ULPI phys drive > this clk themselves and so it isn't necessary to turn on to probe > a ULPI device, but the HSIC phy doesn't provide one itself, so we > must turn it on here. > > Cc: 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/ci_hdrc_msm.c | 58 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 54 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c > index 07cccd24a87f..40249b0e3e93 100644 > --- a/drivers/usb/chipidea/ci_hdrc_msm.c > +++ b/drivers/usb/chipidea/ci_hdrc_msm.c > @@ -10,11 +10,19 @@ > #include <linux/pm_runtime.h> > #include <linux/usb/gadget.h> > #include <linux/usb/chipidea.h> > +#include <linux/clk.h> > +#include <linux/reset.h> > > #include "ci.h" > > #define HS_PHY_AHB_MODE 0x0098 > > +struct ci_hdrc_msm { > + struct platform_device *ci; > + struct clk *core_clk; > + struct clk *iface_clk; > +}; > + > static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) > { > struct device *dev = ci->gadget.dev.parent; > @@ -43,34 +51,76 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { > > static int ci_hdrc_msm_probe(struct platform_device *pdev) > { > + struct ci_hdrc_msm *ci; > struct platform_device *plat_ci; > + struct clk *clk; > + struct reset_control *reset; > + int ret; > > dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); > > + ci = devm_kzalloc(&pdev->dev, sizeof(*ci), GFP_KERNEL); > + if (!ci) > + return -ENOMEM; > + platform_set_drvdata(pdev, ci); > + > + reset = devm_reset_control_get(&pdev->dev, "core"); > + if (IS_ERR(reset)) > + return PTR_ERR(reset); > + > + ci->core_clk = clk = devm_clk_get(&pdev->dev, "core"); > + if (IS_ERR(clk)) > + return PTR_ERR(clk); > + > + ci->iface_clk = clk = devm_clk_get(&pdev->dev, "iface"); > + if (IS_ERR(clk)) > + return PTR_ERR(clk); You say it has three clocks in commit log, why it is only two in the code? > + > + reset_control_assert(reset); > + usleep_range(10000, 12000); > + reset_control_deassert(reset); > + > + ret = clk_prepare_enable(ci->core_clk); > + if (ret) > + return ret; > + > + ret = clk_prepare_enable(ci->iface_clk); > + if (ret) > + goto err_iface; > + > plat_ci = ci_hdrc_add_device(&pdev->dev, > pdev->resource, pdev->num_resources, > &ci_hdrc_msm_platdata); ci->plat_ci(or ci) = ... Delete the local variable plat_ci > if (IS_ERR(plat_ci)) { > dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); > - return PTR_ERR(plat_ci); > + ret = PTR_ERR(plat_ci); > + goto err_mux; > } > > - platform_set_drvdata(pdev, plat_ci); > + ci->ci = plat_ci; [...] -- Best Regards, Peter Chen
WARNING: multiple messages have this Message-ID (diff)
From: hzpeterchen@gmail.com (Peter Chen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/21] usb: chipidea: msm: Add proper clk and reset support Date: Wed, 29 Jun 2016 15:02:12 +0800 [thread overview] Message-ID: <20160629070212.GI25236@shlinux2> (raw) In-Reply-To: <20160626072838.28082-15-stephen.boyd@linaro.org> On Sun, Jun 26, 2016 at 12:28:31AM -0700, Stephen Boyd wrote: > The msm chipidea controller uses two main clks, an AHB clk to > read/write the MMIO registers and a core clk called the system > clk that drives the controller itself. Add support for these clks > as they're required in all designs. > > Also add support for an optional third clk that we need to turn > on to read/write the ULPI phy registers. Some ULPI phys drive > this clk themselves and so it isn't necessary to turn on to probe > a ULPI device, but the HSIC phy doesn't provide one itself, so we > must turn it on here. > > Cc: 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/ci_hdrc_msm.c | 58 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 54 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c > index 07cccd24a87f..40249b0e3e93 100644 > --- a/drivers/usb/chipidea/ci_hdrc_msm.c > +++ b/drivers/usb/chipidea/ci_hdrc_msm.c > @@ -10,11 +10,19 @@ > #include <linux/pm_runtime.h> > #include <linux/usb/gadget.h> > #include <linux/usb/chipidea.h> > +#include <linux/clk.h> > +#include <linux/reset.h> > > #include "ci.h" > > #define HS_PHY_AHB_MODE 0x0098 > > +struct ci_hdrc_msm { > + struct platform_device *ci; > + struct clk *core_clk; > + struct clk *iface_clk; > +}; > + > static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) > { > struct device *dev = ci->gadget.dev.parent; > @@ -43,34 +51,76 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { > > static int ci_hdrc_msm_probe(struct platform_device *pdev) > { > + struct ci_hdrc_msm *ci; > struct platform_device *plat_ci; > + struct clk *clk; > + struct reset_control *reset; > + int ret; > > dev_dbg(&pdev->dev, "ci_hdrc_msm_probe\n"); > > + ci = devm_kzalloc(&pdev->dev, sizeof(*ci), GFP_KERNEL); > + if (!ci) > + return -ENOMEM; > + platform_set_drvdata(pdev, ci); > + > + reset = devm_reset_control_get(&pdev->dev, "core"); > + if (IS_ERR(reset)) > + return PTR_ERR(reset); > + > + ci->core_clk = clk = devm_clk_get(&pdev->dev, "core"); > + if (IS_ERR(clk)) > + return PTR_ERR(clk); > + > + ci->iface_clk = clk = devm_clk_get(&pdev->dev, "iface"); > + if (IS_ERR(clk)) > + return PTR_ERR(clk); You say it has three clocks in commit log, why it is only two in the code? > + > + reset_control_assert(reset); > + usleep_range(10000, 12000); > + reset_control_deassert(reset); > + > + ret = clk_prepare_enable(ci->core_clk); > + if (ret) > + return ret; > + > + ret = clk_prepare_enable(ci->iface_clk); > + if (ret) > + goto err_iface; > + > plat_ci = ci_hdrc_add_device(&pdev->dev, > pdev->resource, pdev->num_resources, > &ci_hdrc_msm_platdata); ci->plat_ci(or ci) = ... Delete the local variable plat_ci > if (IS_ERR(plat_ci)) { > dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n"); > - return PTR_ERR(plat_ci); > + ret = PTR_ERR(plat_ci); > + goto err_mux; > } > > - platform_set_drvdata(pdev, plat_ci); > + ci->ci = plat_ci; [...] -- Best Regards, Peter Chen
next prev parent reply other threads:[~2016-06-29 7:09 UTC|newest] Thread overview: 214+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-26 7:28 [PATCH 00/21] Support qcom's HSIC USB and rewrite USB2 HS phy support Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 01/21] of: device: Support loading a module with OF based modalias Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 4:17 ` Bjorn Andersson 2016-06-28 4:17 ` Bjorn Andersson 2016-06-28 4:39 ` Rob Herring [not found] ` <20160626072838.28082-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-26 7:28 ` [PATCH 02/21] usb: ulpi: Support device discovery via DT Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-3-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-27 4:21 ` kbuild test robot 2016-06-27 4:21 ` kbuild test robot 2016-06-27 4:21 ` kbuild test robot 2016-06-27 14:34 ` Heikki Krogerus 2016-06-27 14:34 ` Heikki Krogerus 2016-06-27 22:10 ` Stephen Boyd 2016-06-27 22:10 ` Stephen Boyd 2016-06-28 11:42 ` Heikki Krogerus 2016-06-28 11:42 ` Heikki Krogerus 2016-06-28 18:27 ` Stephen Boyd 2016-06-28 18:27 ` Stephen Boyd 2016-06-29 1:53 ` Peter Chen 2016-06-29 1:53 ` Peter Chen 2016-06-28 20:56 ` Rob Herring 2016-06-28 20:56 ` Rob Herring 2016-06-28 22:09 ` Stephen Boyd 2016-06-28 22:09 ` Stephen Boyd 2016-07-01 0:59 ` Rob Herring 2016-07-01 0:59 ` Rob Herring 2016-07-01 0:59 ` Rob Herring 2016-07-06 6:16 ` Stephen Boyd 2016-07-06 6:16 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 03/21] usb: ulpi: Avoid reading/writing in device creation with OF devices Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 14/21] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 7:02 ` Peter Chen [this message] 2016-06-29 7:02 ` Peter Chen 2016-06-26 7:28 ` [PATCH 20/21] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 8:49 ` Neil Armstrong 2016-06-28 8:49 ` Neil Armstrong 2016-06-28 21:58 ` Stephen Boyd 2016-06-28 21:58 ` Stephen Boyd 2016-06-28 21:58 ` Stephen Boyd 2016-06-29 9:16 ` Neil Armstrong 2016-06-29 9:16 ` Neil Armstrong 2016-06-29 9:16 ` Neil Armstrong [not found] ` <57739203.9000601-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2016-06-29 18:54 ` Stephen Boyd 2016-06-29 18:54 ` Stephen Boyd 2016-06-29 18:54 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 21/21] phy: Add support for Qualcomm's USB HS phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 3:09 ` [PATCH 00/21] Support qcom's HSIC USB and rewrite USB2 HS phy support John Stultz 2016-06-28 3:09 ` John Stultz 2016-06-28 3:09 ` John Stultz 2016-06-28 8:34 ` Stephen Boyd 2016-06-28 8:34 ` Stephen Boyd 2016-07-02 6:03 ` John Stultz 2016-07-02 6:03 ` John Stultz 2016-07-02 6:03 ` John Stultz 2016-07-05 19:22 ` Stephen Boyd 2016-07-05 19:22 ` Stephen Boyd 2016-07-05 19:33 ` John Stultz 2016-07-05 19:33 ` John Stultz 2016-07-05 19:33 ` John Stultz 2016-06-26 7:28 ` [PATCH 04/21] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-27 8:04 ` Jun Li 2016-06-27 8:04 ` Jun Li 2016-06-27 8:04 ` Jun Li [not found] ` <AM4PR04MB213088094DF074BB5CB3DD0689210-WOempg8NbQQzjTQnahXoOs9NdZoXdze2vxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2016-06-27 19:07 ` Stephen Boyd 2016-06-27 19:07 ` Stephen Boyd 2016-06-27 19:07 ` Stephen Boyd 2016-06-28 9:36 ` Peter Chen 2016-06-28 9:36 ` Peter Chen 2016-06-28 9:36 ` Peter Chen 2016-06-28 22:10 ` Stephen Boyd 2016-06-28 22:10 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 05/21] usb: chipidea: Handle extcon events properly Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 10:01 ` Peter Chen 2016-06-28 10:01 ` Peter Chen 2016-06-26 7:28 ` [PATCH 06/21] usb: chipidea: Initialize and reinitialize phy later Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 2:30 ` Peter Chen 2016-06-29 2:30 ` Peter Chen 2016-06-30 1:23 ` Stephen Boyd 2016-06-30 1:23 ` Stephen Boyd 2016-06-30 1:22 ` Peter Chen 2016-06-30 1:22 ` Peter Chen 2016-06-26 7:28 ` [PATCH 07/21] usb: chipidea: Notify of reset when switching into host mode Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 08/21] usb: chipidea: Kick OTG state machine for AVVIS with vbus extcon Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-9-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-29 3:09 ` Peter Chen 2016-06-29 3:09 ` Peter Chen 2016-06-29 3:09 ` Peter Chen 2016-06-30 1:19 ` Stephen Boyd 2016-06-30 1:19 ` Stephen Boyd 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:50 ` Jun Li 2016-06-30 1:50 ` Jun Li 2016-06-30 1:50 ` Jun Li 2016-06-26 7:28 ` [PATCH 09/21] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:26 ` Peter Chen 2016-06-29 6:26 ` Peter Chen 2016-06-30 1:29 ` Stephen Boyd 2016-06-30 1:29 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 10/21] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:32 ` Peter Chen 2016-06-29 6:32 ` Peter Chen 2016-06-29 18:59 ` Stephen Boyd 2016-06-29 18:59 ` Stephen Boyd 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:41 ` Stephen Boyd 2016-06-30 1:41 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 11/21] usb: chipidea: msm: Use hw_write_id_reg() instead of writel directly Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:37 ` Peter Chen 2016-06-29 6:37 ` Peter Chen 2016-06-26 7:28 ` [PATCH 12/21] usb: chipidea: msm: Keep device runtime enabled Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:46 ` Peter Chen 2016-06-29 6:46 ` Peter Chen 2016-06-30 0:43 ` Stephen Boyd 2016-06-30 0:43 ` Stephen Boyd 2016-06-30 1:39 ` Peter Chen 2016-06-30 1:39 ` Peter Chen 2016-06-30 20:30 ` Stephen Boyd 2016-06-30 20:30 ` Stephen Boyd 2016-07-01 3:20 ` Peter Chen 2016-07-01 3:20 ` Peter Chen 2016-06-26 7:28 ` [PATCH 13/21] usb: chipidea: msm: Allow core to get usb phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:48 ` Peter Chen 2016-06-29 6:48 ` Peter Chen 2016-06-29 11:34 ` Peter Chen 2016-06-29 11:34 ` Peter Chen 2016-06-29 19:31 ` Stephen Boyd 2016-06-29 19:31 ` Stephen Boyd 2016-06-30 1:43 ` Peter Chen 2016-06-30 1:43 ` Peter Chen 2016-06-30 1:43 ` Peter Chen 2016-06-26 7:28 ` [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-16-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 8:39 ` Stephen Boyd 2016-06-28 8:39 ` Stephen Boyd 2016-06-29 8:08 ` Peter Chen 2016-06-29 8:08 ` Peter Chen 2016-06-29 19:28 ` Stephen Boyd 2016-06-29 19:28 ` Stephen Boyd 2016-06-30 1:52 ` Peter Chen 2016-06-30 1:52 ` Peter Chen 2016-06-30 1:35 ` Stephen Boyd 2016-06-30 1:35 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 16/21] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 8:26 ` Peter Chen 2016-06-29 8:26 ` Peter Chen 2016-06-29 19:13 ` Stephen Boyd 2016-06-29 19:13 ` Stephen Boyd 2016-06-30 8:54 ` Peter Chen 2016-06-30 8:54 ` Peter Chen 2016-06-30 16:24 ` Stephen Boyd 2016-06-30 16:24 ` Stephen Boyd 2016-06-30 16:24 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 17/21] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 11:29 ` Peter Chen 2016-06-29 11:29 ` Peter Chen 2016-06-29 19:17 ` Stephen Boyd 2016-06-29 19:17 ` Stephen Boyd 2016-06-30 9:08 ` Peter Chen 2016-06-30 9:08 ` Peter Chen 2016-06-26 7:28 ` [PATCH 18/21] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-27 3:41 ` kbuild test robot 2016-06-27 3:41 ` kbuild test robot 2016-06-27 4:51 ` kbuild test robot 2016-06-27 4:51 ` kbuild test robot 2016-06-27 7:50 ` kbuild test robot 2016-06-27 7:50 ` kbuild test robot 2016-06-28 1:27 ` Stephen Boyd 2016-06-28 1:27 ` Stephen Boyd 2016-06-29 11:45 ` Peter Chen 2016-06-29 11:45 ` Peter Chen 2016-06-26 7:28 ` [PATCH 19/21] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:26 ` Stephen Boyd 2016-06-30 1:26 ` 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=20160629070212.GI25236@shlinux2 \ --to=hzpeterchen@gmail.com \ --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 \ --cc=stephen.boyd@linaro.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: 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.