Commit 75387237 authored by Boris Brezillon's avatar Boris Brezillon Committed by Stephen Boyd

clk: bcm2835: De-assert/assert PLL reset signal when appropriate

In order to enable a PLL, not only the PLL has to be powered up and
locked, but you also have to de-assert the reset signal. The last part
was missing. Add it so PLLs that were not enabled by the FW/bootloader
can be enabled from Linux.

Fixes: 41691b88 ("clk: bcm2835: Add support for programming the audio domain clocks")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 7928b2cb
...@@ -602,9 +602,7 @@ static void bcm2835_pll_off(struct clk_hw *hw) ...@@ -602,9 +602,7 @@ static void bcm2835_pll_off(struct clk_hw *hw)
const struct bcm2835_pll_data *data = pll->data; const struct bcm2835_pll_data *data = pll->data;
spin_lock(&cprman->regs_lock); spin_lock(&cprman->regs_lock);
cprman_write(cprman, data->cm_ctrl_reg, cprman_write(cprman, data->cm_ctrl_reg, CM_PLL_ANARST);
cprman_read(cprman, data->cm_ctrl_reg) |
CM_PLL_ANARST);
cprman_write(cprman, data->a2w_ctrl_reg, cprman_write(cprman, data->a2w_ctrl_reg,
cprman_read(cprman, data->a2w_ctrl_reg) | cprman_read(cprman, data->a2w_ctrl_reg) |
A2W_PLL_CTRL_PWRDN); A2W_PLL_CTRL_PWRDN);
...@@ -638,6 +636,10 @@ static int bcm2835_pll_on(struct clk_hw *hw) ...@@ -638,6 +636,10 @@ static int bcm2835_pll_on(struct clk_hw *hw)
cpu_relax(); cpu_relax();
} }
cprman_write(cprman, data->a2w_ctrl_reg,
cprman_read(cprman, data->a2w_ctrl_reg) |
A2W_PLL_CTRL_PRST_DISABLE);
return 0; return 0;
} }
......
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