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

Commit 3eaee7d3 authored by Jin Li's avatar Jin Li
Browse files

ARM: dts: msm: modify display node to support DRM for 8996AU 



Since msm-3.18 kernel supports both DRM and FB driver for display,
modify the display related node in dtsi file for 8996 AU platforms
to support both display driver architectures.

Change-Id: I9a5b7148d158c142ccd5af9681f273a19ea923af
Signed-off-by: default avatarJin Li <jinl@codeaurora.org>
parent d7b5ac48

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -339,7 +339,10 @@ 


&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

	connectors = <&mdss_hdmi &display_manager>;

};



&sde_kms {

	connectors = <&sde_hdmi &display_manager>;

	gpus = <&msm_gpu>;

	memory-region = <&cont_splash_mem>;

};
@@ -348,7 +351,7 @@ 
	/delete-property/ qcom,dsi-display-active;

};



&mdss_hdmi {

&sde_hdmi {

	status = "ok";

	qcom,hdmi-tx-ddc-clk-gpio = <&tlmm 32 0>;

	qcom,hdmi-tx-ddc-data-gpio = <&tlmm 33 0>;

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -548,12 +548,15 @@ 


&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

	connectors = <&mdss_hdmi &display_manager>;

};



&sde_kms {

	connectors = <&sde_hdmi &display_manager>;

	gpus = <&msm_gpu>;

	memory-region = <&cont_splash_mem>;

};



&mdss_hdmi {

&sde_hdmi {

	status = "ok";

	qcom,hdmi-tx-ddc-clk-gpio = <&tlmm 32 0>;

	qcom,hdmi-tx-ddc-data-gpio = <&tlmm 33 0>;

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+2 −5
Original line number Diff line number Diff line
@@ -342,8 +342,9 @@ 
	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_hdmi {

&sde_hdmi {

	status = "ok";

	qcom,hdmi-tx-hpd-gpio = <&pm8994_mpps 4 0>;

};



&mdss_dsi {
@@ -374,10 +375,6 @@ 
	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&mdss_hdmi {

	qcom,hdmi-tx-hpd-gpio = <&pm8994_mpps 4 0>;

};



&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi

+20 −50
Original line number Diff line number Diff line
@@ -10,25 +10,10 @@ 
 * GNU General Public License for more details.

 */



#include "dsi-panel-toshiba-720p-video.dtsi"

#include "dsi-panel-sharp-dualmipi-wqxga-video.dtsi"

#include "dsi-panel-nt35597-dualmipi-wqxga-video.dtsi"

#include "dsi-panel-nt35597-dualmipi-wqxga-cmd.dtsi"

#include "dsi-panel-nt35597-dsc-wqxga-video.dtsi"

#include "dsi-panel-jdi-dualmipi-video.dtsi"

#include "dsi-panel-jdi-dualmipi-cmd.dtsi"

#include "dsi-panel-jdi-4k-dualmipi-video-nofbc.dtsi"

#include "dsi-panel-sim-video.dtsi"

#include "dsi-panel-sim-dualmipi-video.dtsi"

#include "dsi-panel-sim-cmd.dtsi"

#include "dsi-panel-sim-dualmipi-cmd.dtsi"

#include "dsi-panel-nt35597-dsc-wqxga-cmd.dtsi"

#include "dsi-panel-hx8379a-truly-fwvga-video.dtsi"

#include "dsi-panel-r69007-dualdsi-wqxga-cmd.dtsi"

#include "msm8996-mdss-panels.dtsi"

#include "dsi-panel-jdi-1080p-video.dtsi"

#include "dsi-panel-sharp-1080p-cmd.dtsi"

#include "dsi-adv7533-720p.dtsi"

#include "dsi-adv7533-1080p.dtsi"





&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {
@@ -65,21 +50,6 @@ 
		};

	};



	dsi_panel_pwr_supply_no_labibb: dsi_panel_pwr_supply_no_labibb {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

			qcom,supply-enable-load = <62000>;

			qcom,supply-disable-load = <80>;

			qcom,supply-post-on-sleep = <20>;

		};

	};



	dsi_panel_pwr_supply_vdd_no_labibb: dsi_panel_pwr_supply_vdd_no_labibb {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -113,8 +83,8 @@ 
			label = "dsi_dual_sharp_video";

			qcom,display-type = "primary";



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

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

			qcom,dsi-ctrl = <&sde_dsi0 &sde_dsi1>;

			qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -135,8 +105,8 @@ 
			label = "single_dsi_sim";

			qcom,display-type = "primary";



			qcom,dsi-ctrl = <&mdss_dsi0>;

			qcom,dsi-phy = <&mdss_dsi_phy0>;

			qcom,dsi-ctrl = <&sde_dsi0>;

			qcom,dsi-phy = <&sde_dsi_phy0>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -155,8 +125,8 @@ 
			label = "single_dsi_toshiba_720p";

			qcom,display-type = "primary";



			qcom,dsi-ctrl = <&mdss_dsi0>;

			qcom,dsi-phy = <&mdss_dsi_phy0>;

			qcom,dsi-ctrl = <&sde_dsi0>;

			qcom,dsi-phy = <&sde_dsi_phy0>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -176,8 +146,8 @@ 
			label = "single_dsi_jdi_1080p";

			qcom,display-type = "primary";



			qcom,dsi-ctrl = <&mdss_dsi0>;

			qcom,dsi-phy = <&mdss_dsi_phy0>;

			qcom,dsi-ctrl = <&sde_dsi0>;

			qcom,dsi-phy = <&sde_dsi_phy0>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -195,8 +165,8 @@ 
			label = "single_dsi_sharp_1080p";

			qcom,display-type = "primary";



			qcom,dsi-ctrl = <&mdss_dsi0>;

			qcom,dsi-phy = <&mdss_dsi_phy0>;

			qcom,dsi-ctrl = <&sde_dsi0>;

			qcom,dsi-phy = <&sde_dsi_phy0>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -227,8 +197,8 @@ 
			label = "dsi_dual_nt35597_cmd";

			qcom,display-type = "primary";



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

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

			qcom,dsi-ctrl = <&sde_dsi0 &sde_dsi1>;

			qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -247,8 +217,8 @@ 
			label = "dsi_dual_nt35597_video";

			qcom,display-type = "primary";



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

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

			qcom,dsi-ctrl = <&sde_dsi0 &sde_dsi1>;

			qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;

			clocks = <&clock_mmss clk_ext_byte0_clk_src>,

				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";
@@ -264,10 +234,6 @@ 
	};

};



&mdss_mdp {

	connectors = <&display_manager>;

};



&dsi_dual_sharp_video {

	qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0

			23 20 06 09 05 03 04 a0
@@ -350,3 +316,7 @@ 
		23 1f 07 09 05 03 04 a0

		23 19 08 08 05 03 04 a0];

};



&sde_kms {

	connectors = <&sde_hdmi &display_manager>;

};

arch/arm/boot/dts/qcom/msm8996-sde.dtsi

+18 −33
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



&soc {

	mdss_mdp: qcom,mdss_mdp@900000 {

	sde_kms: qcom,sde_kms@900000 {

		compatible = "qcom,sde-kms";

		reg = <0x00900000 0x90000>,

		      <0x009b0000 0x1040>,
@@ -47,28 +47,28 @@ 
		#interrupt-cells = <1>;

		iommus = <&mdp_smmu 0>;



		smmu_mdp_unsec: qcom,smmu_mdp_unsec_cb {

			compatible = "qcom,smmu_mdp_unsec";

		smmu_kms_unsec: qcom,smmu_kms_unsec_cb {

			compatible = "qcom,smmu_kms_unsec";

			iommus = <&mdp_smmu 0>;

		};



		smmu_rot_unsec: qcom,smmu_rot_unsec_cb {

			compatible = "qcom,smmu_rot_unsec";

		smmu_nrt_unsec: qcom,smmu_nrt_unsec_cb {

			compatible = "qcom,smmu_nrt_unsec";

			iommus = <&rot_smmu 0>;

		};



		smmu_mdp_sec: qcom,smmu_mdp_sec_cb {

			compatible = "qcom,smmu_mdp_sec";

		smmu_kms_sec: qcom,smmu_kms_sec_cb {

			compatible = "qcom,smmu_kms_sec";

			iommus = <&mdp_smmu 1>;

		};



		smmu_rot_sec: qcom,smmu_rot_sec_cb {

			compatible = "qcom,smmu_rot_sec";

		smmu_nrt_sec: qcom,smmu_nrt_sec_cb {

			compatible = "qcom,smmu_nrt_sec";

			iommus = <&rot_smmu 1>;

		};

	};



	mdss_dsi0: qcom,mdss_dsi_ctrl0@994000 {

	sde_dsi0: qcom,sde_dsi_ctrl0@994000 {

		compatible = "qcom,dsi-ctrl-hw-v1.4";

		label = "dsi-ctrl-0";

		cell-index = <0>;
@@ -103,7 +103,7 @@ 
			<22 512 0 0>,

			<22 512 0 1000>;



		interrupt-parent = <&mdss_mdp>;

		interrupt-parent = <&sde_kms>;

		interrupts = <4 0>;

		qcom,core-supply-entries {

			#address-cells = <1>;
@@ -144,7 +144,7 @@ 
		};

	};



	mdss_dsi1: qcom,mdss_dsi_ctrl1@996000 {

	sde_dsi1: qcom,sde_dsi_ctrl1@996000 {

		compatible = "qcom,dsi-ctrl-hw-v1.4";

		label = "dsi-ctrl-1";

		cell-index = <1>;
@@ -178,7 +178,7 @@ 
			<22 512 0 0>,

			<22 512 0 1000>;



		interrupt-parent = <&mdss_mdp>;

		interrupt-parent = <&sde_kms>;

		interrupts = <5 0>;

		qcom,core-supply-entries {

			#address-cells = <1>;
@@ -218,7 +218,7 @@ 
		};

	};



	mdss_dsi_phy0: qcom,mdss_dsi_phy0@994400 {

	sde_dsi_phy0: qcom,sde_dsi_phy0@994400 {

		compatible = "qcom,dsi-phy-v4.0";

		label = "dsi-phy-0";

		cell-index = <0>;
@@ -277,7 +277,7 @@ 
		};

	};



	mdss_dsi_phy1: qcom,mdss_dsi_phy1@996400 {

	sde_dsi_phy1: qcom,sde_dsi_phy1@996400 {

		compatible = "qcom,dsi-phy-v4.0";

		label = "dsi-phy-1";

		cell-index = <1>;
@@ -336,7 +336,7 @@ 
		};

	};



	mdss_hdmi: qcom,hdmi_tx@9a0000 {

	sde_hdmi: qcom,sde_hdmi@9a0000 {

		compatible = "qcom,hdmi-tx-8996";



		reg =	<0x009a0000 0x50c>,
@@ -356,7 +356,7 @@ 
			"core_clk",

			"alt_iface_clk",

			"extp_clk";

		interrupt-parent = <&mdss_mdp>;

		interrupt-parent = <&sde_kms>;

		interrupts = <8 0>;

		hpd-gdsc-supply = <&gdsc_mdss>;

		qcom,hdmi-tx-ddc-clk-gpio = <&tlmm 32 0>;
@@ -372,23 +372,8 @@ 
			     &mdss_hdmi_ddc_suspend

			     &mdss_hdmi_cec_suspend>;



		hdmi_audio: qcom,msm-hdmi-audio-rx {

		sde_hdmi_audio: qcom,sde-hdmi-audio-rx {

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

		};

	};

};
 


/* dummy nodes for compatibility with 8996 mdss dtsi */

&soc {

	mdss_dsi: qcom,mdss_dsi_dummy {

		/* dummy node for backward compatibility */

	};



	mdss_hdmi_tx: qcom,mdss_hdmi_tx_dummy {

		/* dummy node for backward compatibility */

	};



	mdss_fb2: qcom,mdss_fb2_dummy {

		/* dummy node for backward compatibility */

	};

};