commit b4d79473539c3fc46901b925d15d97a2d0158e39
author Linux Build Service Account <lnxbuild@localhost> Mon May 13 20:41:17 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 13 20:41:16 2013 -0700
tree 995d475ee7450b6bd29e0c8c94038247688901cf
parent 30e277bdf5d9d9fb5c82aea05ba558eb32acd641
parent 9e716dd4069a1bdfa13f1d5512e4553fcd2b54d6

Merge "msm: clock-mdss: Fix clock warnings during DSI panel probe"

arch/arm/mach-msm/clock-mdss-8974.c

diff --git a/arch/arm/mach-msm/clock-mdss-8974.c b/arch/arm/mach-msm/clock-mdss-8974.c
index bf95615..17a6801 100644
--- a/arch/arm/mach-msm/clock-mdss-8974.c
+++ b/arch/arm/mach-msm/clock-mdss-8974.c
@@ -409,9 +409,9 @@
 static enum handoff mdss_dsi_pll_byte_handoff(struct clk *c)
 {
 	if (mdss_gdsc_enabled() && mdss_dsi_check_pll_lock()) {
-		c->rate = 53000000;
-		dsi_pll_rate = 53000000;
-		pll_byte_clk_rate = 53000000;
+		c->rate = 52954560;
+		dsi_pll_rate = 52954560;
+		pll_byte_clk_rate = 52954560;
 		pll_pclk_rate = 105000000;
 		dsipll_refcount++;
 		return HANDOFF_ENABLED_CLK;

drivers/video/msm/mdss/mdss_dsi.c

diff --git a/drivers/video/msm/mdss/mdss_dsi.c b/drivers/video/msm/mdss/mdss_dsi.c
index 5d56df4..3932fc1 100644
--- a/drivers/video/msm/mdss/mdss_dsi.c
+++ b/drivers/video/msm/mdss/mdss_dsi.c
@@ -1092,6 +1092,10 @@
 		ctrl_pdata->panel_data.panel_info.panel_power_on = 1;
 	}
 
+	ctrl_pdata->pclk_rate = dsi_pclk_rate;
+	ctrl_pdata->byte_clk_rate = panel_data->panel_info.clk_rate / 8;
+	pr_debug("%s: pclk=%d, bclk=%d\n", __func__,
+			ctrl_pdata->pclk_rate, ctrl_pdata->byte_clk_rate);
 
 	if (ctrl_pdata->panel_data.panel_info.cont_splash_enabled) {
 		mdss_dsi_prepare_clocks(ctrl_pdata);
@@ -1111,11 +1115,6 @@
 	ctrl_pdata->on = panel_data->on;
 	ctrl_pdata->off = panel_data->off;
 
-	ctrl_pdata->pclk_rate = dsi_pclk_rate;
-	ctrl_pdata->byte_clk_rate = panel_data->panel_info.clk_rate / 8;
-	pr_debug("%s: pclk=%d, bclk=%d\n", __func__,
-			ctrl_pdata->pclk_rate, ctrl_pdata->byte_clk_rate);
-
 	if (panel_data->panel_info.pdest == DISPLAY_1) {
 		mdss_debug_register_base("dsi0",
 			ctrl_pdata->ctrl_base, ctrl_pdata->reg_size);