This commit passes CLK_SET_RATE_PARENT to the "mips_div", "mips_internal_div", and "mips_pll_mux" clocks. This flag is needed for the "mips" clock to propagate rate changes up to the "mips_pll" root clock.
Signed-off-by: Govindraj Raja <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> --- drivers/clk/pistachio/clk-pistachio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clk/pistachio/clk-pistachio.c b/drivers/clk/pistachio/clk-pistachio.c index 47e2fb1..22a7ebd 100644 --- a/drivers/clk/pistachio/clk-pistachio.c +++ b/drivers/clk/pistachio/clk-pistachio.c @@ -57,9 +57,10 @@ static struct pistachio_fixed_factor pistachio_ffs[] __initdata = { }; static struct pistachio_div pistachio_divs[] __initdata = { - DIV(CLK_MIPS_INTERNAL_DIV, "mips_internal_div", "mips_pll_mux", - 0x204, 2), - DIV(CLK_MIPS_DIV, "mips_div", "mips_internal_div", 0x208, 8), + DIV_F(CLK_MIPS_INTERNAL_DIV, "mips_internal_div", "mips_pll_mux", + 0x204, 2, CLK_SET_RATE_PARENT, 0), + DIV_F(CLK_MIPS_DIV, "mips_div", "mips_internal_div", + 0x208, 8, CLK_SET_RATE_PARENT, 0), DIV_F(CLK_AUDIO_DIV, "audio_div", "audio_mux", 0x20c, 8, 0, CLK_DIVIDER_ROUND_CLOSEST), DIV_F(CLK_I2S_DIV, "i2s_div", "audio_pll_mux", @@ -126,7 +127,8 @@ PNAME(mux_xtal_bt) = { "xtal", "bt_pll" }; static struct pistachio_mux pistachio_muxes[] __initdata = { MUX(CLK_AUDIO_REF_MUX, "audio_refclk_mux", mux_xtal_audio_refclk, 0x200, 0), - MUX(CLK_MIPS_PLL_MUX, "mips_pll_mux", mux_xtal_mips, 0x200, 1), + MUX_F(CLK_MIPS_PLL_MUX, "mips_pll_mux", mux_xtal_mips, + 0x200, 1, CLK_SET_RATE_PARENT), MUX(CLK_AUDIO_PLL_MUX, "audio_pll_mux", mux_xtal_audio, 0x200, 2), MUX(CLK_AUDIO_MUX, "audio_mux", mux_audio_debug, 0x200, 4), MUX(CLK_RPU_V_PLL_MUX, "rpu_v_pll_mux", mux_xtal_rpu_v, 0x200, 5), -- 2.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
