| Message ID | ff9ee49a872084b4fc8c7fbabddc820058acb9b7.1507882470.git.chunfeng.yun@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/13/2017 10:26 AM, Chunfeng Yun wrote: > The wakeup debounce clocks for each ports in fact are not > needed, so remove them. > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > --- Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > drivers/usb/host/xhci-mtk.c | 33 --------------------------------- > drivers/usb/host/xhci-mtk.h | 2 -- > 2 files changed, 35 deletions(-) > > diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c > index 97ba51e..d60463c 100644 > --- a/drivers/usb/host/xhci-mtk.c > +++ b/drivers/usb/host/xhci-mtk.c > @@ -237,25 +237,8 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk) > goto sys_clk_err; > } > > - if (mtk->wakeup_src) { > - ret = clk_prepare_enable(mtk->wk_deb_p0); > - if (ret) { > - dev_err(mtk->dev, "failed to enable wk_deb_p0\n"); > - goto usb_p0_err; > - } > - > - ret = clk_prepare_enable(mtk->wk_deb_p1); > - if (ret) { > - dev_err(mtk->dev, "failed to enable wk_deb_p1\n"); > - goto usb_p1_err; > - } > - } > return 0; > > -usb_p1_err: > - clk_disable_unprepare(mtk->wk_deb_p0); > -usb_p0_err: > - clk_disable_unprepare(mtk->sys_clk); > sys_clk_err: > clk_disable_unprepare(mtk->ref_clk); > ref_clk_err: > @@ -264,10 +247,6 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk) > > static void xhci_mtk_clks_disable(struct xhci_hcd_mtk *mtk) > { > - if (mtk->wakeup_src) { > - clk_disable_unprepare(mtk->wk_deb_p1); > - clk_disable_unprepare(mtk->wk_deb_p0); > - } > clk_disable_unprepare(mtk->sys_clk); > clk_disable_unprepare(mtk->ref_clk); > } > @@ -371,18 +350,6 @@ static int usb_wakeup_of_property_parse(struct xhci_hcd_mtk *mtk, > if (!mtk->wakeup_src) > return 0; > > - mtk->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0"); > - if (IS_ERR(mtk->wk_deb_p0)) { > - dev_err(dev, "fail to get wakeup_deb_p0\n"); > - return PTR_ERR(mtk->wk_deb_p0); > - } > - > - mtk->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1"); > - if (IS_ERR(mtk->wk_deb_p1)) { > - dev_err(dev, "fail to get wakeup_deb_p1\n"); > - return PTR_ERR(mtk->wk_deb_p1); > - } > - > mtk->pericfg = syscon_regmap_lookup_by_phandle(dn, > "mediatek,syscon-wakeup"); > if (IS_ERR(mtk->pericfg)) { > diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h > index db55a12..67783a7 100644 > --- a/drivers/usb/host/xhci-mtk.h > +++ b/drivers/usb/host/xhci-mtk.h > @@ -126,8 +126,6 @@ struct xhci_hcd_mtk { > struct regulator *vbus; > struct clk *sys_clk; /* sys and mac clock */ > struct clk *ref_clk; > - struct clk *wk_deb_p0; /* port0's wakeup debounce clock */ > - struct clk *wk_deb_p1; > struct regmap *pericfg; > struct phy **phys; > int num_phys; >
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 97ba51e..d60463c 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -237,25 +237,8 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk) goto sys_clk_err; } - if (mtk->wakeup_src) { - ret = clk_prepare_enable(mtk->wk_deb_p0); - if (ret) { - dev_err(mtk->dev, "failed to enable wk_deb_p0\n"); - goto usb_p0_err; - } - - ret = clk_prepare_enable(mtk->wk_deb_p1); - if (ret) { - dev_err(mtk->dev, "failed to enable wk_deb_p1\n"); - goto usb_p1_err; - } - } return 0; -usb_p1_err: - clk_disable_unprepare(mtk->wk_deb_p0); -usb_p0_err: - clk_disable_unprepare(mtk->sys_clk); sys_clk_err: clk_disable_unprepare(mtk->ref_clk); ref_clk_err: @@ -264,10 +247,6 @@ static int xhci_mtk_clks_enable(struct xhci_hcd_mtk *mtk) static void xhci_mtk_clks_disable(struct xhci_hcd_mtk *mtk) { - if (mtk->wakeup_src) { - clk_disable_unprepare(mtk->wk_deb_p1); - clk_disable_unprepare(mtk->wk_deb_p0); - } clk_disable_unprepare(mtk->sys_clk); clk_disable_unprepare(mtk->ref_clk); } @@ -371,18 +350,6 @@ static int usb_wakeup_of_property_parse(struct xhci_hcd_mtk *mtk, if (!mtk->wakeup_src) return 0; - mtk->wk_deb_p0 = devm_clk_get(dev, "wakeup_deb_p0"); - if (IS_ERR(mtk->wk_deb_p0)) { - dev_err(dev, "fail to get wakeup_deb_p0\n"); - return PTR_ERR(mtk->wk_deb_p0); - } - - mtk->wk_deb_p1 = devm_clk_get(dev, "wakeup_deb_p1"); - if (IS_ERR(mtk->wk_deb_p1)) { - dev_err(dev, "fail to get wakeup_deb_p1\n"); - return PTR_ERR(mtk->wk_deb_p1); - } - mtk->pericfg = syscon_regmap_lookup_by_phandle(dn, "mediatek,syscon-wakeup"); if (IS_ERR(mtk->pericfg)) { diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index db55a12..67783a7 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -126,8 +126,6 @@ struct xhci_hcd_mtk { struct regulator *vbus; struct clk *sys_clk; /* sys and mac clock */ struct clk *ref_clk; - struct clk *wk_deb_p0; /* port0's wakeup debounce clock */ - struct clk *wk_deb_p1; struct regmap *pericfg; struct phy **phys; int num_phys;
The wakeup debounce clocks for each ports in fact are not needed, so remove them. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> --- drivers/usb/host/xhci-mtk.c | 33 --------------------------------- drivers/usb/host/xhci-mtk.h | 2 -- 2 files changed, 35 deletions(-)