openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: imx: gate2: Check if clock is enabled against cgr_val 

Seems the logic here was wrong all along. For example, if
the cgr_val is 2 (0b10), the clk_gate2_reg_is_enabled would
report the clock as disabled. So check against cgr_val instead.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Abel Vesa 2020-10-28 14:59:00 +02:00 committed by Shawn Guo
parent 040adb5fe9
commit 03681d06a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/clk/imx/clk-gate2.c
View File

@ -86,11 +86,11 @@ static void clk_gate2_disable(struct clk_hw *hw)
spin_unlock_irqrestore(gate->lock, flags); spin_unlock_irqrestore(gate->lock, flags);
} }
static int clk_gate2_reg_is_enabled(void __iomem *reg, u8 bit_idx) static int clk_gate2_reg_is_enabled(void __iomem *reg, u8 bit_idx, u8 cgr_val)
{ {
u32 val = readl(reg); u32 val = readl(reg);
if (((val >> bit_idx) & 1) == 1) if (((val >> bit_idx) & 3) == cgr_val)
return 1; return 1;
return 0; return 0;
@ -100,7 +100,7 @@ static int clk_gate2_is_enabled(struct clk_hw *hw)
{ {
struct clk_gate2 *gate = to_clk_gate2(hw); struct clk_gate2 *gate = to_clk_gate2(hw);
return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx); return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx, gate->cgr_val);
} }
static void clk_gate2_disable_unused(struct clk_hw *hw) static void clk_gate2_disable_unused(struct clk_hw *hw)