Commit d90c76bb authored by Eddie James's avatar Eddie James Committed by Stephen Boyd

clk: aspeed: Fix is_enabled for certain clocks

Some of the Aspeed clocks are disabled by setting the relevant bit in
the "clock stop control" register to one, while others are disabled by
setting their bit to zero. The driver already uses a flag per gate  to
identify this behavior, but doesn't apply it in the clock is_enabled
function.

Use the existing gate flag to correctly return whether or not a clock
is enabled in the aspeed_clk_is_enabled function.
Signed-off-by: default avatarEddie James <eajames@linux.vnet.ibm.com>
Fixes: 6671507f ("clk: aspeed: Handle inverse polarity of USB port 1 clock gate")
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 55c19eee
...@@ -259,11 +259,12 @@ static int aspeed_clk_is_enabled(struct clk_hw *hw) ...@@ -259,11 +259,12 @@ static int aspeed_clk_is_enabled(struct clk_hw *hw)
{ {
struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw); struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw);
u32 clk = BIT(gate->clock_idx); u32 clk = BIT(gate->clock_idx);
u32 enval = (gate->flags & CLK_GATE_SET_TO_DISABLE) ? 0 : clk;
u32 reg; u32 reg;
regmap_read(gate->map, ASPEED_CLK_STOP_CTRL, &reg); regmap_read(gate->map, ASPEED_CLK_STOP_CTRL, &reg);
return (reg & clk) ? 0 : 1; return ((reg & clk) == enval) ? 1 : 0;
} }
static const struct clk_ops aspeed_clk_gate_ops = { static const struct clk_ops aspeed_clk_gate_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment