Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: bcm2835: Fix PLL poweron

In poweroff, we set the reset bit and the power down bit, but only
managed to unset the reset bit for poweron. This meant that if HDMI
did -EPROBE_DEFER after it had grabbed its clocks, we'd power down the
PLLH (that had been on at boot time) and never recover.

Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks")
Cc: stable@vger.kernel.org
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

authored by

Eric Anholt and committed by
Stephen Boyd
e708b383 286259ef

+4
+4
drivers/clk/bcm/clk-bcm2835.c
··· 554 554 const struct bcm2835_pll_data *data = pll->data; 555 555 ktime_t timeout; 556 556 557 + cprman_write(cprman, data->a2w_ctrl_reg, 558 + cprman_read(cprman, data->a2w_ctrl_reg) & 559 + ~A2W_PLL_CTRL_PWRDN); 560 + 557 561 /* Take the PLL out of reset. */ 558 562 cprman_write(cprman, data->cm_ctrl_reg, 559 563 cprman_read(cprman, data->cm_ctrl_reg) & ~CM_PLL_ANARST);