1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586 |
- From 25adaf94e0fcbf6c1b47cb610edb7f5c23c53139 Mon Sep 17 00:00:00 2001
- From: Chunfeng Yun <[email protected]>
- Date: Fri, 13 Oct 2017 16:26:37 +0800
- Subject: [PATCH 130/224] usb: xhci-mtk: remove dummy wakeup debounce clocks
- The wakeup debounce clocks for each ports in fact are not
- needed, so remove them.
- Signed-off-by: Chunfeng Yun <[email protected]>
- Acked-by: Mathias Nyman <[email protected]>
- Reviewed-by: Matthias Brugger <[email protected]>
- Signed-off-by: Greg Kroah-Hartman <[email protected]>
- ---
- drivers/usb/host/xhci-mtk.c | 33 ---------------------------------
- drivers/usb/host/xhci-mtk.h | 2 --
- 2 files changed, 35 deletions(-)
- --- 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 x
- 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 @@ ref_clk_err:
-
- 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(
- 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)) {
- --- 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;
|