From: Matthias Brugger <matthias.bgg@gmail.com>
To: Chunfeng Yun <chunfeng.yun@mediatek.com>,
Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org,
linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org
Subject: Re: [RESEND PATCH v2 2/2] usb: xhci-mtk: add an optional xhci_ck clock
Date: Fri, 23 Aug 2019 09:43:42 +0200 [thread overview]
Message-ID: <e4aa560c-c524-8098-cd7f-3d1a6aa2082e@gmail.com> (raw)
In-Reply-To: <1566542425-20082-2-git-send-email-chunfeng.yun@mediatek.com>
On 23/08/2019 08:40, Chunfeng Yun wrote:
> Some SoCs may have an optional clock xhci_ck (125M or 200M), it
> usually uses the same PLL as sys_ck, so support it.
>
> Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> v2 no changes
> ---
> drivers/usb/host/xhci-mtk.c | 13 +++++++++++++
> drivers/usb/host/xhci-mtk.h | 1 +
> 2 files changed, 14 insertions(+)
>
> diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
> index 026fe18972d3..b18a6baef204 100644
> --- a/drivers/usb/host/xhci-mtk.c
> +++ b/drivers/usb/host/xhci-mtk.c
> @@ -216,6 +216,10 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)
> return PTR_ERR(mtk->sys_clk);
> }
>
> + mtk->xhci_clk = devm_clk_get_optional(dev, "xhci_ck");
> + if (IS_ERR(mtk->xhci_clk))
> + return PTR_ERR(mtk->xhci_clk);
> +
> mtk->ref_clk = devm_clk_get_optional(dev, "ref_ck");
> if (IS_ERR(mtk->ref_clk))
> return PTR_ERR(mtk->ref_clk);
> @@ -244,6 +248,12 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
> goto sys_clk_err;
> }
>
> + ret = clk_prepare_enable(mtk->xhci_clk);
> + if (ret) {
> + dev_err(mtk->dev, "failed to enable xhci_clk\n");
> + goto xhci_clk_err;
> + }
> +
> ret = clk_prepare_enable(mtk->mcu_clk);
> if (ret) {
> dev_err(mtk->dev, "failed to enable mcu_clk\n");
> @@ -261,6 +271,8 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
> dma_clk_err:
> clk_disable_unprepare(mtk->mcu_clk);
> mcu_clk_err:
> + clk_disable_unprepare(mtk->xhci_clk);
> +xhci_clk_err:
> clk_disable_unprepare(mtk->sys_clk);
> sys_clk_err:
> clk_disable_unprepare(mtk->ref_clk);
> @@ -272,6 +284,7 @@ static void xhci_mtk_clks_disable(struct xhci_hcd_mtk *mtk)
> {
> clk_disable_unprepare(mtk->dma_clk);
> clk_disable_unprepare(mtk->mcu_clk);
> + clk_disable_unprepare(mtk->xhci_clk);
> clk_disable_unprepare(mtk->sys_clk);
> clk_disable_unprepare(mtk->ref_clk);
> }
> diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
> index 8be8c5f7ff62..5ac458b7d2e0 100644
> --- a/drivers/usb/host/xhci-mtk.h
> +++ b/drivers/usb/host/xhci-mtk.h
> @@ -139,6 +139,7 @@ struct xhci_hcd_mtk {
> struct regulator *vusb33;
> struct regulator *vbus;
> struct clk *sys_clk; /* sys and mac clock */
> + struct clk *xhci_clk;
> struct clk *ref_clk;
> struct clk *mcu_clk;
> struct clk *dma_clk;
>
next prev parent reply other threads:[~2019-08-23 7:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 6:40 [RESEND PATCH v2 1/2] dt-bindings: usb: mtk-xhci: add an optional xhci_ck clock Chunfeng Yun
2019-08-23 6:40 ` [RESEND PATCH v2 2/2] usb: xhci-mtk: " Chunfeng Yun
2019-08-23 7:43 ` Matthias Brugger [this message]
2019-08-23 8:28 ` Mathias Nyman
2019-08-27 22:27 ` [RESEND PATCH v2 1/2] dt-bindings: usb: mtk-xhci: " Rob Herring
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=e4aa560c-c524-8098-cd7f-3d1a6aa2082e@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=chunfeng.yun@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathias.nyman@intel.com \
--cc=robh+dt@kernel.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).