Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095af2aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: dsi: fix clk_rate to use u64 instead of u32"

parents d60ffc05 2212b1d2

drivers/video/msm/mdss/mdss_dsi_panel.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2141,6 +2141,7 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 
		struct mdss_panel_data *panel_data)

		struct mdss_panel_data *panel_data)

{

{

	u32 tmp;

	u32 tmp;

	u64 tmp64;

	int rc, i, len;

	int rc, i, len;

	const char *data;

	const char *data;

	struct mdss_dsi_ctrl_pdata *ctrl_pdata;

	struct mdss_dsi_ctrl_pdata *ctrl_pdata;
@@ -2199,8 +2200,11 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 




	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-framerate", &tmp);

	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-framerate", &tmp);

	pt->timing.frame_rate = !rc ? tmp : DEFAULT_FRAME_RATE;

	pt->timing.frame_rate = !rc ? tmp : DEFAULT_FRAME_RATE;

	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-clockrate", &tmp);

	rc = of_property_read_u64(np, "qcom,mdss-dsi-panel-clockrate", &tmp64);

	pt->timing.clk_rate = !rc ? tmp : 0;

	if (rc == -EOVERFLOW)

		rc = of_property_read_u32(np,

			"qcom,mdss-dsi-panel-clockrate", (u32 *)&tmp64);

	pt->timing.clk_rate = !rc ? tmp64 : 0;





	data = of_get_property(np, "qcom,mdss-dsi-panel-timings", &len);

	data = of_get_property(np, "qcom,mdss-dsi-panel-timings", &len);

	if ((!data) || (len != 12)) {

	if ((!data) || (len != 12)) {

drivers/video/msm/mdss/mdss_panel.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -667,7 +667,7 @@ struct mdss_panel_timing { 




	u32 lm_widths[2];

	u32 lm_widths[2];





	u32 clk_rate;

	u64 clk_rate;

	char frame_rate;

	char frame_rate;





	u8 dsc_enc_total;

	u8 dsc_enc_total;