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

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

Merge "drm/msm/dsi-staging: optimize dsi probe" into msm-4.14

parents 4364c9b0 10e9b127

Documentation/devicetree/bindings/drm/msm/sde-dsi.txt

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ Optional properties: 
- qcom,dsi-display-active: Current active display

- qcom,dsi-ctrl: handle to dsi controller device

- qcom,dsi-phy: handle to dsi phy device

- qcom,dsi-ctrl-num:		Specifies the DSI controllers to use

- qcom,dsi-phy-num:		Specifies the DSI PHYs to use

- qcom,dsi-select-clocks:	Specifies the required clocks to use

- qcom,dsi-display-list:	Specifies the list of supported displays.

- qcom,dsi-manager:       Specifies dsi manager is present

- qcom,dsi-display:       Specifies dsi display is present

- qcom,hdmi-display:      Specifies hdmi is present

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+87 −229
Original line number Diff line number Diff line
@@ -106,376 +106,234 @@ 
	};



	dsi_sharp_4k_dsc_video_display: qcom,dsi-display@0 {

		compatible = "qcom,dsi-display";

		label = "dsi_sharp_4k_dsc_video_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sharp_4k_dsc_video>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_sharp_4k_dsc_cmd_display: qcom,dsi-display@1 {

		compatible = "qcom,dsi-display";

		label = "dsi_sharp_4k_dsc_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sharp_4k_dsc_cmd>;

		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_sharp_1080_cmd_display: qcom,dsi-display@2 {

		compatible = "qcom,dsi-display";

		label = "dsi_sharp_1080_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_sharp_1080_cmd>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_dual_sharp_1080_120hz_cmd_display: qcom,dsi-display@3 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_sharp_1080_120hz_cmd_display";

		qcom,display-type = "primary";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_dual_sharp_1080_120hz_cmd>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_dual_nt35597_truly_video_display: qcom,dsi-display@4 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_nt35597_truly_video_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_dual_nt35597_truly_video>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_dual_nt35597_truly_cmd_display: qcom,dsi-display@5 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_nt35597_truly_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_dual_nt35597_truly_cmd>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_nt35597_truly_dsc_cmd_display: qcom,dsi-display@6 {

		compatible = "qcom,dsi-display";

		label = "dsi_nt35597_truly_dsc_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy1>;

		clocks = <&mdss_dsi1_pll BYTECLK_MUX_1_CLK>,

			<&mdss_dsi1_pll PCLK_MUX_1_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_nt35597_truly_dsc_cmd>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_nt35597_truly_dsc_video_display: qcom,dsi-display@7 {

		compatible = "qcom,dsi-display";

		label = "dsi_nt35597_truly_dsc_video_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy1>;

		clocks = <&mdss_dsi1_pll BYTECLK_MUX_1_CLK>,

			<&mdss_dsi1_pll PCLK_MUX_1_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_nt35597_truly_dsc_video>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_sim_vid_display: qcom,dsi-display@8 {

		compatible = "qcom,dsi-display";

		label = "dsi_sim_vid_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_vid>;

	};



	dsi_dual_sim_vid_display: qcom,dsi-display@9 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_sim_vid_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_vid>;

	};



	dsi_sim_cmd_display: qcom,dsi-display@10 {

		compatible = "qcom,dsi-display";

		label = "dsi_sim_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_cmd>;

	};



	dsi_dual_sim_cmd_display: qcom,dsi-display@11 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_sim_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_cmd>;

	};



	dsi_sim_dsc_375_cmd_display: qcom,dsi-display@12 {

		compatible = "qcom,dsi-display";

		label = "dsi_sim_dsc_375_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_dsc_375_cmd>;

	};



	dsi_dual_sim_dsc_375_cmd_display: qcom,dsi-display@13 {

		compatible = "qcom,dsi-display";

		label = "dsi_dual_sim_dsc_375_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_dsc_375_cmd>;

	};



	dsi_sw43404_amoled_cmd_display: qcom,dsi-display@14 {

		compatible = "qcom,dsi-display";

		label = "dsi_sw43404_amoled_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_sw43404_amoled_cmd>;

		vddio-supply = <&pm855_l14>;

	};



	dsi_nt35695b_truly_fhd_cmd_display: qcom,dsi-display@15 {

		compatible = "qcom,dsi-display";

		label = "dsi_nt35695b_truly_fhd_cmd_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_cmd>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

	};



	dsi_nt35695b_truly_fhd_video_display: qcom,dsi-display@16 {

		compatible = "qcom,dsi-display";

		label = "dsi_nt35695b_truly_fhd_video_display";

		qcom,display-type = "primary";



		qcom,dsi-ctrl = <&mdss_dsi0>;

		qcom,dsi-phy = <&mdss_dsi_phy0>;

		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_video>;

	};



	sde_dsi: qcom,dsi-display {

		compatible = "qcom,dsi-display";



		qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>;

		qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>;



		clocks = <&mdss_dsi0_pll BYTECLK_MUX_0_CLK>,

			<&mdss_dsi0_pll PCLK_MUX_0_CLK>;

		clock-names = "src_byte_clk", "src_pixel_clk";

			 <&mdss_dsi0_pll PCLK_MUX_0_CLK>,

			 <&mdss_dsi1_pll BYTECLK_MUX_1_CLK>,

			 <&mdss_dsi1_pll PCLK_MUX_1_CLK>;

		clock-names = "src_byte_clk0", "src_pixel_clk0",

			      "src_byte_clk1", "src_pixel_clk1";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,platform-te-gpio = <&tlmm 8 0>;

		qcom,platform-reset-gpio = <&tlmm 6 0>;

		qcom,panel-mode-gpio = <&tlmm 7 0>;



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_video>;

		qcom,platform-te-gpio = <&tlmm 8 0>;



		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;



		qcom,dsi-display-list =

			<&dsi_sharp_4k_dsc_video_display

			&dsi_sharp_4k_dsc_cmd_display

			&dsi_sharp_1080_cmd_display

			&dsi_dual_sharp_1080_120hz_cmd_display

			&dsi_dual_nt35597_truly_video_display

			&dsi_dual_nt35597_truly_cmd_display

			&dsi_nt35597_truly_dsc_cmd_display

			&dsi_nt35597_truly_dsc_video_display

			&dsi_sim_vid_display

			&dsi_dual_sim_vid_display

			&dsi_sim_cmd_display

			&dsi_dual_sim_cmd_display

			&dsi_sim_dsc_375_cmd_display

			&dsi_dual_sim_dsc_375_cmd_display

			&dsi_sw43404_amoled_cmd_display

			&dsi_nt35695b_truly_fhd_cmd_display

			&dsi_nt35695b_truly_fhd_video_display>;

	};



	sde_wb: qcom,wb-display@0 {
@@ -508,7 +366,7 @@ 
};



&mdss_mdp {

	connectors = <&sde_wb &sde_dp>;

	connectors = <&sde_wb &sde_dp &sde_dsi>;

};



/* PHY TIMINGS REVISION P */

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+233 −267

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/dsi-staging/dsi_display.h

+2 −9
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ struct dsi_display_boot_param { 
	int length;

	struct device_node *node;

	int cmdline_topology;

	void *disp;

};



/**
@@ -170,7 +171,6 @@ struct dsi_display { 
	const char *name;

	const char *display_type;

	struct list_head list;

	bool is_active;

	bool is_cont_splash_enabled;

	struct mutex display_lock;
@@ -179,6 +179,7 @@ struct dsi_display { 


	/* panel info */

	struct dsi_panel *panel;

	struct device_node *disp_node;

	struct device_node *panel_of;



	struct dsi_display_mode *modes;
@@ -247,14 +248,6 @@ int dsi_display_get_num_of_displays(void); 
int dsi_display_get_active_displays(void **display_array,

		u32 max_display_count);



/**

 * dsi_display_get_boot_display()- get DSI boot display name

 * @index:	index of display selection

 *

 * Return:	returns the display node pointer

 */

struct device_node *dsi_display_get_boot_display(int index);



/**

 * dsi_display_get_display_by_name()- finds display by name

 * @name:	name of the display.

drivers/gpu/drm/msm/msm_drv.c

+0 −13
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "msm_gpu.h"

#include "msm_kms.h"

#include "sde_wb.h"

#include "dsi_display.h"



/*

 * MSM driver version:
@@ -1824,7 +1823,6 @@ static int add_display_components(struct device *dev, 
{

	struct device *mdp_dev = NULL;

	struct device_node *node;

	const char *name;

	int ret;



	if (of_device_is_compatible(dev->of_node, "qcom,sde-kms")) {
@@ -1839,17 +1837,6 @@ static int add_display_components(struct device *dev, 
			component_match_add(dev, matchptr, compare_of, node);

		}



		for (i = 0; i < MAX_DSI_ACTIVE_DISPLAY; i++) {

			node = dsi_display_get_boot_display(i);



			if (node != NULL) {

				name = of_get_property(node, "label", NULL);

				component_match_add(dev, matchptr, compare_of,

						node);

				pr_debug("Added component = %s\n", name);

			}

		}



		return 0;

	}