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

Commit 7a8bd778 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 backlight gpio invert support for display"

parents 83a1f7ab 12a6d379

Documentation/devicetree/bindings/fb/mdss-dsi.txt

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ Optional properties: 
					both modes.

- qcom,platform-intf-mux-gpio:		Select dsi/external(hdmi) interface through gpio when it supports

					either dsi or external interface.

- qcom,platform-bklight-en-gpio-invert:	Invert the gpio used to enable display back-light

- qcom,panel-mode-gpio:			Specifies the GPIO to select video/command/single-port/dual-port

					mode of panel through gpio when it supports these modes.

- pinctrl-names:			List of names to assign mdss pin states defined in pinctrl device node

					Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:			Lists phandles each pointing to the pin configuration node within a pin
@@ -253,6 +256,8 @@ Example: 
			qcom,platform-bklight-en-gpio = <&msmgpio 86 0>;

			qcom,platform-mode-gpio = <&msmgpio 7 0>;

			qcom,platform-intf-mux-gpio = <&tlmm 115 0>;

			qcom,platform-bklight-en-gpio-invert;

			qcom,panel-mode-gpio = <&msmgpio 107 0>;

			qcom,dsi-irq-line;

			qcom,lane-map = "lane_map_3012";

			qcom,display-id = "primary";

drivers/video/fbdev/msm/dsi_v2.c

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ static int dsi_parse_gpio(struct platform_device *pdev, 
		pr_err("%s:%d, bklt_en gpio not specified\n",

						__func__, __LINE__);



	ctrl_pdata->bklt_en_gpio_invert =

			of_property_read_bool(ctrl_pdev->dev.of_node,

				"qcom,platform-bklight-en-gpio-invert");



	return 0;

}

drivers/video/fbdev/msm/mdss_dsi.c

+4 −0
Original line number Diff line number Diff line
@@ -4084,6 +4084,10 @@ static int mdss_dsi_parse_gpio_params(struct platform_device *ctrl_pdev, 
	if (!gpio_is_valid(ctrl_pdata->bklt_en_gpio))

		pr_info("%s: bklt_en gpio not specified\n", __func__);



	ctrl_pdata->bklt_en_gpio_invert =

			of_property_read_bool(ctrl_pdev->dev.of_node,

				"qcom,platform-bklight-en-gpio-invert");



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

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

	if (!gpio_is_valid(ctrl_pdata->rst_gpio))

drivers/video/fbdev/msm/mdss_dsi.h

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ struct mdss_dsi_ctrl_pdata { 
	int bklt_en_gpio;

	int mode_gpio;

	int intf_mux_gpio;

	bool bklt_en_gpio_invert;

	int lcd_mode_sel_gpio;

	int bklt_ctrl;	/* backlight ctrl */

	enum dsi_ctrl_op_mode bklt_dcs_op_mode; /* backlight dcs ctrl mode */

	bool pwm_pmi;

drivers/video/fbdev/msm/mdss_dsi_panel.c

+14 −3
Original line number Diff line number Diff line
@@ -449,8 +449,14 @@ int mdss_dsi_panel_reset(struct mdss_panel_data *pdata, int enable) 
			}



			if (gpio_is_valid(ctrl_pdata->bklt_en_gpio)) {



				if (ctrl_pdata->bklt_en_gpio_invert)

					rc = gpio_direction_output(

						ctrl_pdata->bklt_en_gpio, 0);

				else

					rc = gpio_direction_output(

						ctrl_pdata->bklt_en_gpio, 1);



				if (rc) {

					pr_err("%s: unable to set dir for bklt gpio\n",

						__func__);
@@ -482,7 +488,12 @@ int mdss_dsi_panel_reset(struct mdss_panel_data *pdata, int enable) 
		}

	} else {

		if (gpio_is_valid(ctrl_pdata->bklt_en_gpio)) {



			if (ctrl_pdata->bklt_en_gpio_invert)

				gpio_set_value((ctrl_pdata->bklt_en_gpio), 1);

			else

				gpio_set_value((ctrl_pdata->bklt_en_gpio), 0);



			gpio_free(ctrl_pdata->bklt_en_gpio);

		}

		if (gpio_is_valid(ctrl_pdata->disp_en_gpio)) {