| Message ID | 1566542425-20082-1-git-send-email-chunfeng.yun@mediatek.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [RESEND,v2,1/2] dt-bindings: usb: mtk-xhci: add an optional xhci_ck clock | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
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; >
On 23.8.2019 9.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> Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
On Fri, 23 Aug 2019 14:40:24 +0800, Chunfeng Yun wrote: > Add a new optional clock xhci_ck > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- > v2 changes: > 1. add the new clock at the end, suggested by Rob > --- > Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt index 266c2d917a28..f3e4acecabe8 100644 --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt @@ -30,7 +30,8 @@ Required properties: the following ones are optional: "ref_ck": reference clock used by low power mode etc, "mcu_ck": mcu_bus clock for register access, - "dma_ck": dma_bus clock for data transfer by DMA + "dma_ck": dma_bus clock for data transfer by DMA, + "xhci_ck": controller clock - phys : see usb-hcd.txt in the current directory @@ -100,7 +101,7 @@ Required properties: - clocks : a list of phandle + clock-specifier pairs, one for each entry in clock-names - clock-names : must contain "sys_ck", and the following ones are optional: - "ref_ck", "mcu_ck" and "dma_ck" + "ref_ck", "mcu_ck" and "dma_ck", "xhci_ck" Optional properties: - vbus-supply : reference to the VBUS regulator;
Add a new optional clock xhci_ck Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- v2 changes: 1. add the new clock at the end, suggested by Rob --- Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)