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

Commit 54189305 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: add te gpio for command mode panel"

parents c02c12f4 ff0dd5c9

arch/arm/boot/dts/msm8974-mdss.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
		qcom,platform-reset-gpio = <&pm8941_gpios 19 1>;

		qcom,platform-enable-gpio = <&msmgpio 58 1>;

		qcom,platform-reset-sequence = <1 20 0 200 1 20 2>;

		qcom,platform-te-gpio = <&msmgpio 12 0>;

		qcom,platform-strength-ctrl = [ff 06];

		qcom,platform-bist-ctrl = [00 00 b1 ff 00 00];

		qcom,platform-regulator-settings = [07 09 03 00 20 00 01];

drivers/video/msm/mdss/mdss_dsi.c

+9 −6
Original line number Diff line number Diff line
@@ -1176,12 +1176,15 @@ int dsi_panel_device_register(struct device_node *pan_node, 
		}

	}



	ctrl_pdata->disp_te_gpio = of_get_named_gpio(ctrl_pdev->dev.of_node,

						"qcom,platform-te-gpio", 0);

	if (!gpio_is_valid(ctrl_pdata->disp_te_gpio)) {

	if (panel_data->panel_info.type == MIPI_CMD_PANEL) {

		ctrl_pdata->disp_te_gpio = of_get_named_gpio

			(ctrl_pdev->dev.of_node, "qcom,platform-te-gpio", 0);

		if (!gpio_is_valid(ctrl_pdata->disp_te_gpio))

			pr_err("%s:%d, Disp_te gpio not specified\n",

			       __func__, __LINE__);

	} else {

	}



	if (gpio_is_valid(ctrl_pdata->disp_te_gpio)) {

		rc = gpio_request(ctrl_pdata->disp_te_gpio, "disp_te");

		if (rc) {

			pr_err("request TE gpio failed, rc=%d\n",