diff options
| author | Finley Xiao <finley.xiao@rock-chips.com> | 2018-04-12 16:05:09 +0800 |
|---|---|---|
| committer | Finley Xiao <finley.xiao@rock-chips.com> | 2018-04-28 09:19:57 +0800 |
| commit | b075e3b123bda312b2997492b1e939f075c26031 (patch) | |
| tree | 27d566943d51ada307dea248a91bdfa2b19b3fad | |
| parent | 72e0d7d1d8d93d1becf1c2e1199f72a9529adad5 (diff) | |
Revert "clk: rockchip: rk3399: Fix clk_cifout and clk_cifout_src"
This reverts commit 44822b10317558fc14d41962a7781d4267cd1592.
Change-Id: I4cc331caf0e6cd853099a770f438276762a219f3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
| -rw-r--r-- | drivers/clk/rockchip/clk-rk3399.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 8a31d5523475..c6d65bf067f7 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -1361,12 +1361,12 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(27), 6, GFLAGS), /* cif */ - COMPOSITE(0, "clk_cifout_src", mux_pll_src_cpll_gpll_npll_p, 0, - RK3399_CLKSEL_CON(56), 6, 2, MFLAGS, 0, 5, DFLAGS, + COMPOSITE_NODIV(0, "clk_cifout_src", mux_pll_src_cpll_gpll_npll_p, 0, + RK3399_CLKSEL_CON(56), 6, 2, MFLAGS, RK3399_CLKGATE_CON(10), 7, GFLAGS), - MUX(SCLK_CIF_OUT, "clk_cifout", mux_clk_cif_p, CLK_SET_RATE_PARENT, - RK3399_CLKSEL_CON(56), 5, 1, MFLAGS), + COMPOSITE_NOGATE(SCLK_CIF_OUT, "clk_cifout", mux_clk_cif_p, 0, + RK3399_CLKSEL_CON(56), 5, 1, MFLAGS, 0, 5, DFLAGS), /* gic */ COMPOSITE(ACLK_GIC_PRE, "aclk_gic_pre", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED, |