Commit b2fcb285 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman

usb: xhci-mtk: add an optional xhci_ck clock

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: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/1566542425-20082-2-git-send-email-chunfeng.yun@mediatek.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e74e8bbf
...@@ -216,6 +216,10 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk) ...@@ -216,6 +216,10 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)
return PTR_ERR(mtk->sys_clk); 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"); mtk->ref_clk = devm_clk_get_optional(dev, "ref_ck");
if (IS_ERR(mtk->ref_clk)) if (IS_ERR(mtk->ref_clk))
return PTR_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) ...@@ -244,6 +248,12 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
goto sys_clk_err; 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); ret = clk_prepare_enable(mtk->mcu_clk);
if (ret) { if (ret) {
dev_err(mtk->dev, "failed to enable mcu_clk\n"); 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) ...@@ -261,6 +271,8 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk)
dma_clk_err: dma_clk_err:
clk_disable_unprepare(mtk->mcu_clk); clk_disable_unprepare(mtk->mcu_clk);
mcu_clk_err: mcu_clk_err:
clk_disable_unprepare(mtk->xhci_clk);
xhci_clk_err:
clk_disable_unprepare(mtk->sys_clk); clk_disable_unprepare(mtk->sys_clk);
sys_clk_err: sys_clk_err:
clk_disable_unprepare(mtk->ref_clk); clk_disable_unprepare(mtk->ref_clk);
...@@ -272,6 +284,7 @@ static void xhci_mtk_clks_disable(struct xhci_hcd_mtk *mtk) ...@@ -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->dma_clk);
clk_disable_unprepare(mtk->mcu_clk); clk_disable_unprepare(mtk->mcu_clk);
clk_disable_unprepare(mtk->xhci_clk);
clk_disable_unprepare(mtk->sys_clk); clk_disable_unprepare(mtk->sys_clk);
clk_disable_unprepare(mtk->ref_clk); clk_disable_unprepare(mtk->ref_clk);
} }
......
...@@ -139,6 +139,7 @@ struct xhci_hcd_mtk { ...@@ -139,6 +139,7 @@ struct xhci_hcd_mtk {
struct regulator *vusb33; struct regulator *vusb33;
struct regulator *vbus; struct regulator *vbus;
struct clk *sys_clk; /* sys and mac clock */ struct clk *sys_clk; /* sys and mac clock */
struct clk *xhci_clk;
struct clk *ref_clk; struct clk *ref_clk;
struct clk *mcu_clk; struct clk *mcu_clk;
struct clk *dma_clk; struct clk *dma_clk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment