evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: read pluggable flag from device tree

Browse source 
Add support to configure pluggable feature through device tree,
but not hardcode inside driver.

Change-Id: I1aaf8a65c1910e22bdaf678d0d02d7fe791937bf
Signed-off-by: Vinu Deokaran <vinud@codeaurora.org>
[cip@codeaurora.org: Resolved merge conflict]
Signed-off-by: Clarence Ip <cip@codeaurora.org>
This commit is contained in:
Vinu Deokaran 2015-11-16 17:21:03 -05:00 • committed by David Keitel
parent 9351ecb2b3
commit 2389db4d20
5 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/fb/mdss-dsi.txt
View file

@ -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 {

2
Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt
View file

@ -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";

3
drivers/video/fbdev/msm/mdss_dsi.c
View file

@ -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;

5
drivers/video/fbdev/msm/mdss_hdmi_tx.c
View file

@ -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:

1
drivers/video/fbdev/msm/mdss_hdmi_tx.h
View file

@ -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 {