Commit 75387237 authored Mar 22, 2018 by Boris Brezillon Committed by Stephen Boyd Apr 06, 2018

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: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

parent 7928b2cb

drivers/clk/bcm/clk-bcm2835.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -602,9 +602,7 @@ static void bcm2835_pll_off(struct clk_hw *hw)
		const struct bcm2835_pll_data *data = pll->data;

		spin_lock(&cprman->regs_lock);
		cprman_write(cprman, data->cm_ctrl_reg,
		cprman_read(cprman, data->cm_ctrl_reg) \|
		CM_PLL_ANARST);
		cprman_write(cprman, data->cm_ctrl_reg, CM_PLL_ANARST);
		cprman_write(cprman, data->a2w_ctrl_reg,
		cprman_read(cprman, data->a2w_ctrl_reg) \|
		A2W_PLL_CTRL_PWRDN);
		@@ -638,6 +636,10 @@ static int bcm2835_pll_on(struct clk_hw *hw)
		cpu_relax();
		}

		cprman_write(cprman, data->a2w_ctrl_reg,
		cprman_read(cprman, data->a2w_ctrl_reg) \|
		A2W_PLL_CTRL_PRST_DISABLE);

		return 0;
		}

Admin message