diff options
| author | Abel Vesa <abel.vesa@nxp.com> | 2020-10-28 14:59:00 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2020-11-03 07:55:35 +0800 |
| commit | 03681d06a555a6c5f39de48d68082e7444db329f (patch) | |
| tree | 916a7cbd63ba24b7bedd0c0ee44c4209fc427e01 /drivers/clk/imx/clk-gate2.c | |
| parent | 040adb5fe95ad39c0a714cf3b05950974caf42ed (diff) | |
| download | linux-03681d06a555a6c5f39de48d68082e7444db329f.tar.bz2 | |
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>
Diffstat (limited to 'drivers/clk/imx/clk-gate2.c')
| -rw-r--r-- | drivers/clk/imx/clk-gate2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c index e1f6cd931a8d..40bcc2ddddba 100644 --- a/drivers/clk/imx/clk-gate2.c +++ b/drivers/clk/imx/clk-gate2.c @@ -86,11 +86,11 @@ out: 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); - if (((val >> bit_idx) & 1) == 1) + if (((val >> bit_idx) & 3) == cgr_val) return 1; return 0; @@ -100,7 +100,7 @@ static int clk_gate2_is_enabled(struct clk_hw *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) |