clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk
authorBoris Brezillon <boris.brezillon@free-electrons.com>
Thu, 1 Dec 2016 19:27:21 +0000 (20:27 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Jan 2017 07:07:43 +0000 (08:07 +0100)
commit9d9541d44a26dea009247e001ebd7775e2feeb37
treea1352952598d9f6de671337095076d4ca91596f9
parente01b04be3eb00456d65278cfa56cfd8103872bfb
clk: bcm2835: Avoid overwriting the div info when disabling a pll_div clk

commit 68af4fa8f39b542a6cde7ac19518d88e9b3099dc upstream.

bcm2835_pll_divider_off() is resetting the divider field in the A2W reg
to zero when disabling the clock.

Make sure we preserve this value by reading the previous a2w_reg value
first and ORing the result with A2W_PLL_CHANNEL_DISABLE.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks")
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/bcm/clk-bcm2835.c