shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: dwc3: core: pipe_clk/pipe_clk depends on CONFIG_NO_GKI

Browse Source 
Fixes: ef32b29caa ("UPSTREAM: usb: dwc3: add optional PHY interface clocks")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9a578ce6b75463c6ed2e6197951b7bb8f034045b
This commit is contained in:
Tao Huang
2024-06-06 18:39:34 +08:00
parent c498274be9
commit 04938b63b9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/dwc3/core.c
View File

@@ -853,6 +853,7 @@ static int dwc3_clk_enable(struct dwc3 *dwc)
if (ret)
goto disable_ref_clk;
#ifdef CONFIG_NO_GKI
ret = clk_prepare_enable(dwc->utmi_clk);
if (ret)
goto disable_susp_clk;
@@ -860,13 +861,16 @@ static int dwc3_clk_enable(struct dwc3 *dwc)
ret = clk_prepare_enable(dwc->pipe_clk);
if (ret)
goto disable_utmi_clk;
#endif
return 0;
#ifdef CONFIG_NO_GKI
disable_utmi_clk:
clk_disable_unprepare(dwc->utmi_clk);
disable_susp_clk:
clk_disable_unprepare(dwc->susp_clk);
#endif
disable_ref_clk:
clk_disable_unprepare(dwc->ref_clk);
disable_bus_clk:
@@ -876,8 +880,10 @@ disable_bus_clk:
static void dwc3_clk_disable(struct dwc3 *dwc)
{
#ifdef CONFIG_NO_GKI
clk_disable_unprepare(dwc->pipe_clk);
clk_disable_unprepare(dwc->utmi_clk);
#endif
clk_disable_unprepare(dwc->susp_clk);
clk_disable_unprepare(dwc->ref_clk);
clk_disable_unprepare(dwc->bus_clk);
@@ -1852,6 +1858,7 @@ static int dwc3_get_clocks(struct dwc3 *dwc)
}
}
#ifdef CONFIG_NO_GKI
/* specific to Rockchip RK3588 */
dwc->utmi_clk = devm_clk_get_optional(dev, "utmi");
if (IS_ERR(dwc->utmi_clk)) {
@@ -1865,6 +1872,7 @@ static int dwc3_get_clocks(struct dwc3 *dwc)
return dev_err_probe(dev, PTR_ERR(dwc->pipe_clk),
"could not get pipe clock\n");
}
#endif
return 0;
}

2
drivers/usb/dwc3/core.h
View File

@@ -1179,8 +1179,10 @@ struct dwc3 {
struct clk *bus_clk;
struct clk *ref_clk;
struct clk *susp_clk;
#ifdef CONFIG_NO_GKI
struct clk *utmi_clk;
struct clk *pipe_clk;
#endif
struct reset_control *reset;