| Message ID | 20200502155834.27481-4-dariobin@libero.it |
|---|---|
| State | Accepted |
| Commit | e3b5d74c778a8782f763412679ca4c3cb2d496c3 |
| Delegated to: | Lukasz Majewski |
| Headers | show |
| Series | change the clk-mux get_rate helper | expand |
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 6264b63900..8f85e84ae9 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -134,12 +134,20 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) if (mux->flags & CLK_MUX_HIWORD_MASK) { reg = mux->mask << (mux->shift + 16); } else { +#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) + reg = mux->io_mux_val; +#else reg = readl(mux->reg); +#endif reg &= ~(mux->mask << mux->shift); } val = val << mux->shift; reg |= val; +#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) + mux->io_mux_val = reg; +#else writel(reg, mux->reg); +#endif return 0; }
The tests developed for the mux clock are run on the sandbox. They don't call the clk_mux_set_parent routine and therefore they do not detect this error. Signed-off-by: Dario Binacchi <dariobin@libero.it> --- drivers/clk/clk-mux.c | 8 ++++++++ 1 file changed, 8 insertions(+)