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

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

Merge "mdss: display: Correlate frame and clock rate names"

parents dad20435 145d2408

arch/arm/boot/dts/dsi-panel-orise-720p-video.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
		qcom,mdss-pan-dsi-stream = <0>;

		qcom,mdss-pan-dsi-mdp-tr = <0x0>;

		qcom,mdss-pan-dsi-dma-tr = <0x04>;

		qcom,mdss-pan-dsi-frame-rate = <60>;

		qcom,mdss-pan-dsi-framerate = <60>;

		qcom,panel-phy-regulatorSettings = [03 01 01 00  /* Regualotor settings */

						    20 00 01];

		qcom,panel-phy-timingSettings = [69 29 1f 00 55 55

drivers/video/msm/mdss/mdss_dsi_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -733,9 +733,9 @@ static int mdss_panel_parse_dt(struct device_node *np, 
		pinfo->mode_gpio_state = MODE_GPIO_NOT_VALID;

	}



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

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

	pinfo->mipi.frame_rate = (!rc ? tmp : 60);

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

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

	pinfo->clk_rate = (!rc ? tmp : 0);

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

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