From 43069ad44a53439a7b49e74b7340ea84ff3af1f7 Mon Sep 17 00:00:00 2001 From: Satya Rama Aditya Pinapala Date: Wed, 11 Sep 2019 11:45:40 -0700 Subject: [PATCH] disp: msm: dsi: use panel's force_clk_lane_hs instead of phy's In order to make dsi panel and dsi2hdmi panel compatible, delete "qcom,panel-force-clock-lane-hs" property in phy and use display panel's force_clk_lane_hs property. Change-Id: I490e08b2ee859797c2b3aeddf109a3a4286fb922 Signed-off-by: Satya Rama Aditya Pinapala --- msm/dsi/dsi_defs.h | 1 - msm/dsi/dsi_display.c | 7 +++++++ msm/dsi/dsi_panel.c | 3 --- msm/dsi/dsi_phy.c | 3 --- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h index be7b239482..f8ebdc2a95 100644 --- a/msm/dsi/dsi_defs.h +++ b/msm/dsi/dsi_defs.h @@ -522,7 +522,6 @@ struct dsi_video_engine_cfg { bool hsa_lp11_en; bool eof_bllp_lp11_en; bool bllp_lp11_en; - bool force_clk_lane_hs; enum dsi_video_traffic_mode traffic_mode; u32 vc_id; u32 dma_sched_line; diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index ba39abc53f..afba80ab63 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -3724,6 +3724,13 @@ static int dsi_display_res_init(struct dsi_display *display) goto error_ctrl_put; } + display_for_each_ctrl(i, display) { + struct msm_dsi_phy *phy = display->ctrl[i].phy; + + phy->cfg.force_clk_lane_hs = + display->panel->host_config.force_hs_clk_lane; + } + rc = dsi_display_parse_lane_map(display); if (rc) { DSI_ERR("Lane map not found, rc=%d\n", rc); diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c index eb8983919b..f69bbd7e76 100644 --- a/msm/dsi/dsi_panel.c +++ b/msm/dsi/dsi_panel.c @@ -1363,9 +1363,6 @@ static int dsi_panel_parse_video_host_config(struct dsi_video_engine_cfg *cfg, cfg->bllp_lp11_en = utils->read_bool(utils->data, "qcom,mdss-dsi-bllp-power-mode"); - cfg->force_clk_lane_hs = of_property_read_bool(utils->data, - "qcom,mdss-dsi-force-clock-lane-hs"); - traffic_mode = utils->get_property(utils->data, "qcom,mdss-dsi-traffic-mode", NULL); diff --git a/msm/dsi/dsi_phy.c b/msm/dsi/dsi_phy.c index e6a1a60fd3..db6aff7bd2 100644 --- a/msm/dsi/dsi_phy.c +++ b/msm/dsi/dsi_phy.c @@ -340,9 +340,6 @@ static int dsi_phy_settings_init(struct platform_device *pdev, "qcom,dsi-phy-regulator-min-datarate-bps", &phy->regulator_min_datarate_bps); - phy->cfg.force_clk_lane_hs = of_property_read_bool(pdev->dev.of_node, - "qcom,panel-force-clock-lane-hs"); - return 0; err: lane->count_per_lane = 0;