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

Commit 07786d44 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: read pluggable flag from device tree"

parents 15188558 6917d600

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

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ Optional properties: 
					"lane_map_1032" = <1 0 3 2>

					"lane_map_2103" = <2 1 0 3>

					"lane_map_3210" = <3 2 1 0>

- qcom,pluggable			Boolean to enable hotplug feature.



Example:

	mdss_dsi: qcom,mdss_dsi@0 {

Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Optional properties: 
- qcom,conti-splash-enabled: Enables the hdmi continuous splash screen feature.

  HDMI interface will remain powered on from LK to kernel with continuous

  display of bootup logo.

- qcom,pluggable: boolean to enable hotplug feature.



[Optional child nodes]: These nodes are for devices which are

dependent on HDMI Tx controller. If HDMI Tx controller is disabled then
@@ -88,6 +89,7 @@ Example: 
		qcom,hdmi-tx-mux-sel = <&msmgpio 85 0>;



		qcom,conditional-power-on;

		qcom,pluggable;



		qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

drivers/video/msm/mdss/mdss_dsi.c

+3 −0
Original line number Diff line number Diff line
@@ -3356,6 +3356,9 @@ static int mdss_dsi_parse_ctrl_params(struct platform_device *ctrl_pdev, 
	mdss_dsi_parse_lane_swap(ctrl_pdev->dev.of_node,

			&(ctrl_pdata->dlane_swap));



	pinfo->is_pluggable = of_property_read_bool(ctrl_pdev->dev.of_node,

		"qcom,pluggable");



	return 0;

drivers/video/msm/mdss/mdss_hdmi_tx.c

+4 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static int hdmi_tx_init_panel_info(struct hdmi_tx_ctrl *hdmi_ctrl) 
	pinfo->lcdc.hsync_skew = 0;



	pinfo->cont_splash_enabled = hdmi_ctrl->pdata.cont_splash_enabled;

	pinfo->is_pluggable = true;

	pinfo->is_pluggable = hdmi_ctrl->pdata.pluggable;



	return 0;

} /* hdmi_tx_init_panel_info */
@@ -4782,6 +4782,9 @@ static int hdmi_tx_get_dt_data(struct platform_device *pdev, 
			hdmi_ctrl->mdss_util->panel_intf_status(DISPLAY_2,

			MDSS_PANEL_INTF_HDMI) ? true : false;



	pdata->pluggable = of_property_read_bool(pdev->dev.of_node,

		"qcom,pluggable");



	return rc;



error:

drivers/video/msm/mdss/mdss_hdmi_tx.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct hdmi_tx_platform_data { 
	struct reg_bus_client *reg_bus_clt[HDMI_TX_MAX_PM];

	/* bitfield representing each module's pin state */

	u64 pin_states;

	bool pluggable;

};



struct hdmi_tx_pinctrl {