msm_fb: Use clk_set_rate() to vote on ebi_clk rates
clk_set_rate() and clk_set_min_rate() share a common implementation
for ebi_clk, but the clk_set_min_rate() API will soon be eliminated.
Remove its use in preparation for this.
Change-Id: I5a4a4a2f5e2e0ba4989bc7c1f9423653bec0af0f
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/drivers/video/msm/lcdc.c b/drivers/video/msm/lcdc.c
index cf8a5ff..135bf68 100644
--- a/drivers/video/msm/lcdc.c
+++ b/drivers/video/msm/lcdc.c
@@ -29,7 +29,6 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
-#include <mach/clk.h>
#include "msm_fb.h"
@@ -78,7 +77,7 @@
#ifndef CONFIG_MSM_BUS_SCALING
if (mfd->ebi1_clk) {
if (mdp_rev == MDP_REV_303) {
- if (clk_set_min_rate(mfd->ebi1_clk, 0))
+ if (clk_set_rate(mfd->ebi1_clk, 0))
pr_err("%s: ebi1_lcdc_clk set rate failed\n",
__func__);
}
@@ -117,7 +116,7 @@
if (mfd->ebi1_clk) {
if (mdp_rev == MDP_REV_303) {
- if (clk_set_min_rate(mfd->ebi1_clk, 65000000))
+ if (clk_set_rate(mfd->ebi1_clk, 65000000))
pr_err("%s: ebi1_lcdc_clk set rate failed\n",
__func__);
} else {
diff --git a/drivers/video/msm/msm_dss_io_7x27a.c b/drivers/video/msm/msm_dss_io_7x27a.c
index 5f1abd4..032c9cd 100644
--- a/drivers/video/msm/msm_dss_io_7x27a.c
+++ b/drivers/video/msm/msm_dss_io_7x27a.c
@@ -13,7 +13,6 @@
#include <linux/clk.h>
#include "msm_fb.h"
#include "mipi_dsi.h"
-#include <mach/clk.h>
/* multimedia sub system sfpb */
char *mmss_sfpb_base;
@@ -313,7 +312,7 @@
unsigned data = 0;
uint32 pll_ctrl;
- if (clk_set_min_rate(ebi1_dsi_clk, 65000000)) /* 65 MHz */
+ if (clk_set_rate(ebi1_dsi_clk, 65000000)) /* 65 MHz */
pr_err("%s: ebi1_dsi_clk set rate failed\n", __func__);
clk_enable(ebi1_dsi_clk);
@@ -339,7 +338,7 @@
clk_disable(mdp_dsi_pclk);
/* DSIPHY_PLL_CTRL_0, disable dsi pll */
MIPI_OUTP(MIPI_DSI_BASE + 0x0200, 0x40);
- if (clk_set_min_rate(ebi1_dsi_clk, 0))
+ if (clk_set_rate(ebi1_dsi_clk, 0))
pr_err("%s: ebi1_dsi_clk set rate failed\n", __func__);
clk_disable(ebi1_dsi_clk);
}