leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: do not disable clock if it is critical

Browse Source 
Do not disable clock if it is a critical one.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Claudiu Beznea 2020-09-07 17:46:35 +03:00 committed by Eugen Hristev
parent 4d139f3838
commit 9a5d59dfc6
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/clk/clk-uclass.c
View File

@ -606,6 +606,9 @@ int clk_disable(struct clk *clk)
if (CONFIG_IS_ENABLED(CLK_CCF)) {
if (clk->id && !clk_get_by_id(clk->id, &clkp)) {
if (clkp->flags & CLK_IS_CRITICAL)
return 0;
if (clkp->enable_count == 0) {
printf("clk %s already disabled\n",
clkp->dev->name);

32
test/dm/clk_ccf.c
View File

@ -24,7 +24,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts)
int ret;
#if CONFIG_IS_ENABLED(CLK_CCF)
const char *clkname;
int clkid;
int clkid, i;
#endif
/* Get the device using the clk device */
@ -157,6 +157,36 @@ static int dm_test_clk_ccf(struct unit_test_state *uts)
pclk = clk_get_parent(clk);
ut_assertok_ptr(pclk);
ut_asserteq_str(clkname, pclk->dev->name);
/* Test disabling critical clock. */
ret = clk_get_by_id(SANDBOX_CLK_I2C_ROOT, &clk);
ut_assertok(ret);
ut_asserteq_str("i2c_root", clk->dev->name);
/* Disable it, if any. */
ret = sandbox_clk_enable_count(clk);
for (i = 0; i < ret; i++) {
ret = clk_disable(clk);
ut_assertok(ret);
}
ret = sandbox_clk_enable_count(clk);
ut_asserteq(ret, 0);
clk->flags = CLK_IS_CRITICAL;
ret = clk_enable(clk);
ut_assertok(ret);
ret = clk_disable(clk);
ut_assertok(ret);
ret = sandbox_clk_enable_count(clk);
ut_asserteq(ret, 1);
clk->flags &= ~CLK_IS_CRITICAL;
ret = clk_disable(clk);
ut_assertok(ret);
ret = sandbox_clk_enable_count(clk);
ut_asserteq(ret, 0);
#endif
return 1;