diff options
author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2015-12-22 16:28:02 -0500 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2015-12-23 15:57:30 -0500 |
commit | 84a8c541664b037a4d1fdc3151466b4ec45c37a5 (patch) | |
tree | 9bdcbc15dc436daa5705d41291b6cbfa1eb4a30d | |
parent | 66746420898984a273ea08fa5926bd1640eaed3e (diff) |
clk: rockchip: Allow the RK3288 SPDIF clocks to change their parent
The clock branches leading to sclk_spdif and sclk_spdif_8ch on RK3288
SoCs only feed those clocks, allow those clocks to change their parents
all the way up the hierarchy.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
-rw-r--r-- | drivers/clk/rockchip/clk-rk3288.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 3d1a6efdbe99..074550c0cb90 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c | |||
@@ -317,25 +317,25 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { | |||
317 | 317 | ||
318 | MUX(0, "spdif_src", mux_pll_src_cpll_gpll_p, 0, | 318 | MUX(0, "spdif_src", mux_pll_src_cpll_gpll_p, 0, |
319 | RK3288_CLKSEL_CON(5), 15, 1, MFLAGS), | 319 | RK3288_CLKSEL_CON(5), 15, 1, MFLAGS), |
320 | COMPOSITE_NOMUX(0, "spdif_pre", "spdif_src", 0, | 320 | COMPOSITE_NOMUX(0, "spdif_pre", "spdif_src", CLK_SET_RATE_PARENT, |
321 | RK3288_CLKSEL_CON(5), 0, 7, DFLAGS, | 321 | RK3288_CLKSEL_CON(5), 0, 7, DFLAGS, |
322 | RK3288_CLKGATE_CON(4), 4, GFLAGS), | 322 | RK3288_CLKGATE_CON(4), 4, GFLAGS), |
323 | COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_src", 0, | 323 | COMPOSITE_FRACMUX(0, "spdif_frac", "spdif_src", CLK_SET_RATE_PARENT, |
324 | RK3288_CLKSEL_CON(9), 0, | 324 | RK3288_CLKSEL_CON(9), 0, |
325 | RK3288_CLKGATE_CON(4), 5, GFLAGS, | 325 | RK3288_CLKGATE_CON(4), 5, GFLAGS, |
326 | MUX(0, "spdif_mux", mux_spdif_p, 0, | 326 | MUX(0, "spdif_mux", mux_spdif_p, CLK_SET_RATE_PARENT, |
327 | RK3288_CLKSEL_CON(5), 8, 2, MFLAGS)), | 327 | RK3288_CLKSEL_CON(5), 8, 2, MFLAGS)), |
328 | GATE(SCLK_SPDIF, "sclk_spdif", "spdif_mux", 0, | 328 | GATE(SCLK_SPDIF, "sclk_spdif", "spdif_mux", CLK_SET_RATE_PARENT, |
329 | RK3288_CLKGATE_CON(4), 6, GFLAGS), | 329 | RK3288_CLKGATE_CON(4), 6, GFLAGS), |
330 | COMPOSITE_NOMUX(0, "spdif_8ch_pre", "spdif_src", 0, | 330 | COMPOSITE_NOMUX(0, "spdif_8ch_pre", "spdif_src", CLK_SET_RATE_PARENT, |
331 | RK3288_CLKSEL_CON(40), 0, 7, DFLAGS, | 331 | RK3288_CLKSEL_CON(40), 0, 7, DFLAGS, |
332 | RK3288_CLKGATE_CON(4), 7, GFLAGS), | 332 | RK3288_CLKGATE_CON(4), 7, GFLAGS), |
333 | COMPOSITE_FRACMUX(0, "spdif_8ch_frac", "spdif_8ch_pre", 0, | 333 | COMPOSITE_FRACMUX(0, "spdif_8ch_frac", "spdif_8ch_pre", CLK_SET_RATE_PARENT, |
334 | RK3288_CLKSEL_CON(41), 0, | 334 | RK3288_CLKSEL_CON(41), 0, |
335 | RK3288_CLKGATE_CON(4), 8, GFLAGS, | 335 | RK3288_CLKGATE_CON(4), 8, GFLAGS, |
336 | MUX(0, "spdif_8ch_mux", mux_spdif_8ch_p, 0, | 336 | MUX(0, "spdif_8ch_mux", mux_spdif_8ch_p, CLK_SET_RATE_PARENT, |
337 | RK3288_CLKSEL_CON(40), 8, 2, MFLAGS)), | 337 | RK3288_CLKSEL_CON(40), 8, 2, MFLAGS)), |
338 | GATE(SCLK_SPDIF8CH, "sclk_spdif_8ch", "spdif_8ch_mux", 0, | 338 | GATE(SCLK_SPDIF8CH, "sclk_spdif_8ch", "spdif_8ch_mux", CLK_SET_RATE_PARENT, |
339 | RK3288_CLKGATE_CON(4), 9, GFLAGS), | 339 | RK3288_CLKGATE_CON(4), 9, GFLAGS), |
340 | 340 | ||
341 | GATE(0, "sclk_acc_efuse", "xin24m", 0, | 341 | GATE(0, "sclk_acc_efuse", "xin24m", 0, |