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

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

Merge "ARM: dts: msm: enable Display Port driver for SDM670"

parents 868c7362 d03f38f0

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

+3 −5
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ 


	ext_disp: qcom,msm-ext-disp {

		compatible = "qcom,msm-ext-disp";

		status = "disabled";



		ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {

			compatible = "qcom,msm-ext-disp-audio-codec-rx";
@@ -487,7 +486,6 @@ 
	sde_dp: qcom,dp_display@0{

		cell-index = <0>;

		compatible = "qcom,dp-display";

		status = "disabled";



		gdsc-supply = <&mdss_core_gdsc>;

		vdda-1p2-supply = <&pm660_l1>;
@@ -500,10 +498,11 @@ 
			<0xaf02000 0x1a0>,

			<0x780000 0x621c>,

			<0x88ea030 0x10>,

			<0x88e8000 0x20>,

			<0x0aee1000 0x034>;

		reg-names = "dp_ctrl", "dp_phy", "dp_ln_tx0", "dp_ln_tx1",

			"dp_mmss_cc", "qfprom_physical", "dp_pll",

			"hdcp_physical";

			"usb3_dp_com", "hdcp_physical";



		interrupt-parent = <&mdss_mdp>;

		interrupts = <12 0>;
@@ -586,7 +585,6 @@ 
};



&sde_dp {

	status = "disabled";

	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";

	pinctrl-0 = <&sde_dp_aux_active &sde_dp_usbplug_cc_active>;

	pinctrl-1 = <&sde_dp_aux_suspend &sde_dp_usbplug_cc_suspend>;
@@ -596,7 +594,7 @@ 
};



&mdss_mdp {

	connectors = <&sde_rscc &sde_wb>;

	connectors = <&sde_rscc &sde_wb &sde_dp>;

};



&dsi_dual_nt35597_truly_video {

arch/arm64/boot/dts/qcom/sdm670-sde-pll.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 


	mdss_dp_pll: qcom,mdss_dp_pll@88ea000 {

		compatible = "qcom,mdss_dp_pll_10nm";

		status = "disabled";

		label = "MDSS DP PLL";

		cell-index = <0>;

		#clock-cells = <1>;