target: msm8974: Fix gcdb/autopll merge conflict
Fix merge conflict issue with the recent commit 98e94f1.
The DSI pll was not getting configured dynamically based on panel
resolution. This fixes and correctly set the DSI related
clocks on 8974.
Change-Id: I2efc2af493e91e8accf7821c5f546cc241d9a6f3
diff --git a/target/msm8974/target_display.c b/target/msm8974/target_display.c
index 7b35aa0..e02ea22 100644
--- a/target/msm8974/target_display.c
+++ b/target/msm8974/target_display.c
@@ -126,11 +126,11 @@
if (enable) {
mdp_gdsc_ctrl(enable);
mdp_clock_init();
- mdss_dsi_uniphy_pll_config(MIPI_DSI0_BASE);
+ mdss_dsi_auto_pll_config(MIPI_DSI0_BASE, pll_data);
dsi_pll_enable_seq(MIPI_DSI0_BASE);
if (panel.panel_info.mipi.dual_dsi &&
!(panel.panel_info.mipi.broadcast)) {
- mdss_dsi_uniphy_pll_config(MIPI_DSI1_BASE);
+ mdss_dsi_auto_pll_config(MIPI_DSI1_BASE, pll_data);
dsi_pll_enable_seq(MIPI_DSI1_BASE);
}
mmss_clock_auto_pll_init(DSI0_PHY_PLL_OUT, dual_dsi,