diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2016-01-27 21:38:37 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-02-04 13:53:15 +0100 |
| commit | aebe3ad801ebbcd90b3649c24ae0e90d2db8bde8 (patch) | |
| tree | 38942513fac2c407e68d28ec569f2709fb2a3009 /drivers/clk/rockchip | |
| parent | clk: rockchip: free memory in error cases when registering clock branches (diff) | |
| download | linux-aebe3ad801ebbcd90b3649c24ae0e90d2db8bde8.tar.xz linux-aebe3ad801ebbcd90b3649c24ae0e90d2db8bde8.zip | |
clk: rockchip: fix parent of hclk_vcodec on rk3036
hclk_vcodec is a child of aclk_vcodec with the fixed factor clock
hclk_vcodec_pre in between and not a child of hclk_disp_pre.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk/rockchip')
| -rw-r--r-- | drivers/clk/rockchip/clk-rk3036.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c index 9c317a3b81e5..38139dce9f7e 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -380,7 +380,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { GATE(HCLK_LCDC, "hclk_lcdc", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(9), 5, GFLAGS), /* hclk_video gates */ - GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(3), 12, GFLAGS), + GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0, RK2928_CLKGATE_CON(3), 12, GFLAGS), /* xin24m gates */ GATE(SCLK_PVTM_CORE, "sclk_pvtm_core", "xin24m", 0, RK2928_CLKGATE_CON(10), 0, GFLAGS), |