From b9de3db6c6f728e80055f46259e461d86987ef00 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Wed, 8 Apr 2015 11:45:44 -0400 Subject: [PATCH] mdss: mdp: remove mdp source clock MDP core clock has been turned into a voter clock and can now be directly voted for. No longer need a reference to source clock. Change-Id: I7c9efc1d56d54840cea43776f53505a32a92f7a5 Signed-off-by: Terence Hampson --- drivers/video/fbdev/msm/mdss.h | 1 - drivers/video/fbdev/msm/mdss_mdp.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss.h b/drivers/video/fbdev/msm/mdss.h index 8d015640796c..b7fa2b0cea12 100644 --- a/drivers/video/fbdev/msm/mdss.h +++ b/drivers/video/fbdev/msm/mdss.h @@ -37,7 +37,6 @@ enum mdss_mdp_clk_type { MDSS_CLK_AHB, MDSS_CLK_AXI, - MDSS_CLK_MDP_SRC, MDSS_CLK_MDP_CORE, MDSS_CLK_MDP_LUT, MDSS_CLK_MDP_VSYNC, diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index 6b69865abf54..41ff28fac69a 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -645,7 +645,7 @@ void mdss_mdp_set_clk_rate(unsigned long rate) { struct mdss_data_type *mdata = mdss_res; unsigned long clk_rate; - struct clk *clk = mdss_mdp_get_clk(MDSS_CLK_MDP_SRC); + struct clk *clk = mdss_mdp_get_clk(MDSS_CLK_MDP_CORE); unsigned long min_clk_rate; min_clk_rate = max(rate, mdata->perf_tune.min_mdp_clk); @@ -970,8 +970,6 @@ static int mdss_mdp_irq_clk_setup(struct mdss_data_type *mdata) if (mdss_mdp_irq_clk_register(mdata, "bus_clk", MDSS_CLK_AXI) || mdss_mdp_irq_clk_register(mdata, "iface_clk", MDSS_CLK_AHB) || - mdss_mdp_irq_clk_register(mdata, "core_clk_src", - MDSS_CLK_MDP_SRC) || mdss_mdp_irq_clk_register(mdata, "core_clk", MDSS_CLK_MDP_CORE)) return -EINVAL; @@ -987,7 +985,8 @@ static int mdss_mdp_irq_clk_setup(struct mdss_data_type *mdata) /* Setting the default clock rate to the max supported.*/ mdss_mdp_set_clk_rate(mdata->max_mdp_clk_rate); - pr_debug("mdp clk rate=%ld\n", mdss_mdp_get_clk_rate(MDSS_CLK_MDP_SRC)); + pr_debug("mdp clk rate=%ld\n", + mdss_mdp_get_clk_rate(MDSS_CLK_MDP_CORE)); return 0; }