From: zhangqing Date: Thu, 16 Jul 2015 11:49:42 +0000 (-0700) Subject: rk3288: clk: slove make warning for clk-ops.c X-Git-Tag: firefly_0821_release~3894 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a8a2ed2a7be54f89ec6b12fc8909858c1cf1292;p=firefly-linux-kernel-4.4.55.git rk3288: clk: slove make warning for clk-ops.c Signed-off-by: zhangqing --- diff --git a/drivers/clk/rockchip/clk-ops.c b/drivers/clk/rockchip/clk-ops.c index a10c62ae924c..7930a8cd9e3b 100644 --- a/drivers/clk/rockchip/clk-ops.c +++ b/drivers/clk/rockchip/clk-ops.c @@ -644,9 +644,11 @@ static int clk_3288_dclk_lcdc0_set_rate(struct clk_hw *hw, unsigned long rate, /* set aclk_vio */ if (parent_rate == __clk_get_rate(gpll)) { + parent = clk_get(NULL, "clk_gpll"); clk_set_parent(aclk_vio0, gpll); clk_set_rate(aclk_vio0, 300*MHZ); } else { + parent = clk_get(NULL, "clk_cpll"); clk_set_parent(aclk_vio0, cpll); clk_set_rate(aclk_vio0, __clk_get_rate(cpll)); } @@ -714,9 +716,11 @@ static int clk_3288_dclk_lcdc1_set_rate(struct clk_hw *hw, unsigned long rate, /* set aclk_vio */ if (parent_rate == __clk_get_rate(gpll)) { + parent = clk_get(NULL, "clk_gpll"); clk_set_parent(aclk_vio1, gpll); clk_set_rate(aclk_vio1, 300*MHZ); } else { + parent = clk_get(NULL, "clk_cpll"); clk_set_parent(aclk_vio1, cpll); clk_set_rate(aclk_vio1, __clk_get_rate(cpll)); }