Merge "msm: mdss: update DSI PHY panel timing dt parsing logic" (8e4ebba9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_dsi_panel.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -1956,6 +1956,7 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
		const char *data;
		struct mdss_dsi_ctrl_pdata *ctrl_pdata;
		struct mdss_panel_info *pinfo;
		bool phy_timings_present;

		pinfo = &panel_data->panel_info;

		@@ -2023,12 +2024,13 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,

		data = of_get_property(np, "qcom,mdss-dsi-panel-timings", &len);
		if ((!data) \|\| (len != 12)) {
		pr_err("%s:%d, Unable to read Phy timing settings",
		pr_debug("%s:%d, Unable to read Phy timing settings",
		__func__, __LINE__);
		return -EINVAL;
		}
		} else {
		for (i = 0; i < len; i++)
		pt->phy_timing[i] = data[i];
		phy_timings_present = true;
		}

		data = of_get_property(np, "qcom,mdss-dsi-panel-timings-8996", &len);
		if ((!data) \|\| (len != 40)) {
		@@ -2037,6 +2039,11 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
		} else {
		for (i = 0; i < len; i++)
		pt->phy_timing_8996[i] = data[i];
		phy_timings_present = true;
		}
		if (!phy_timings_present) {
		pr_err("%s: phy timing settings not present\n", __func__);
		return -EINVAL;
		}

		rc = of_property_read_u32(np, "qcom,mdss-dsi-t-clk-pre", &tmp);