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

Commit 4219679e authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  ARM: dts: msm: Add DP AUX gpio config for sdmmagpie QRD
  drm/msm/dp: enable gpio aux switch support
  misc: hdcp: fix resetting repeater flag
  drm/dp: defer h/w hpd registeration to the end of dp sub module init
  drm/msm/dsi-staging: Add ULPS support for platforms with legacy dsi phy
  Revert "drm/msm/sde: modify DSC initial_lines calculation"
  drm/msm/dp: update sink voltage and pre-emphasis
  drm/msm/sde: back off plane state changes in continuous splash
  drm/msm/dsi-staging: add mdp transfer time as mode property
  drm/msm/sde: Apply mode on the first frame after boot

Change-Id: I02c9a60d95953203ed8f76a17bbf0429aa78ccf0
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 9e5706f2 65d04cc7

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ DP Controller: Required properties: 
- qcom,dp-usbpd-detection:	Phandle for the PMI regulator node for USB PHY PD detection.

- qcom,dp-usbpd-detection:	Phandle for the PMI regulator node for USB PHY PD detection.

- qcom,dp-aux-switch:		Phandle for the driver used to program the AUX switch for Display Port orientation.

- qcom,dp-aux-switch:		Phandle for the driver used to program the AUX switch for Display Port orientation.

- qcom,dp-hpd-gpio:		HPD gpio for direct DP connector without USB PHY or AUX switch.

- qcom,dp-hpd-gpio:		HPD gpio for direct DP connector without USB PHY or AUX switch.

- qcom,dp-gpio-aux-switch:»       Gpio DP AUX switch chipset support.

- qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types"

- qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types"

					can be "core", "ctrl", and "phy". Within the same type,

					can be "core", "ctrl", and "phy". Within the same type,

					there can be more than one instance of this binding,

					there can be more than one instance of this binding,

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,10 @@ 
	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;

	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;

};

};





&sde_dp {

	qcom,dp-aux-switch = <&fsa4480>;

};



&qupv3_se7_i2c {

&qupv3_se7_i2c {

	status = "ok";

	status = "ok";

	st_fts@49 {

	st_fts@49 {

arch/arm64/boot/dts/qcom/sdmmagpie-pinctrl.dtsi

+26 −0
Original line number Original line Diff line number Diff line
@@ -1031,6 +1031,32 @@ 
			};

			};

		};

		};





		sde_dp_aux_active: sde_dp_aux_active {

			mux {

				pins = "gpio42", "gpio33";

				function = "gpio";

			};



			config {

				pins = "gpio42", "gpio33";

				bias-disable = <0>; /* no pull */

				drive-strength = <8>;

			};

		};



		sde_dp_aux_suspend: sde_dp_aux_suspend {

			mux {

				pins = "gpio42", "gpio33";

				function = "gpio";

			};



			config {

				pins = "gpio42", "gpio33";

				bias-pull-down;

				drive-strength = <2>;

			};

		};



		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {

		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {

			mux {

			mux {

				pins = "gpio104";

				pins = "gpio104";

arch/arm64/boot/dts/qcom/sdmmagpie-qrd.dtsi

+13 −0
Original line number Original line Diff line number Diff line
@@ -409,3 +409,16 @@ 
		    0x00 0x23c /* CHG_CTRL2 */

		    0x00 0x23c /* CHG_CTRL2 */

		    0x22 0x210>; /* PWR_CTRL1 */

		    0x22 0x210>; /* PWR_CTRL1 */

};

};



&fsa4480 {

	status = "disabled";

};



&sde_dp {

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

	qcom,aux-en-gpio = <&tlmm 42 0>;

	qcom,aux-sel-gpio = <&tlmm 33 0>;

	qcom,dp-gpio-aux-switch;

};

arch/arm64/boot/dts/qcom/sdmmagpie-sde.dtsi

+0 −1
Original line number Original line Diff line number Diff line
@@ -636,7 +636,6 @@ 
		qcom,mst-enable;

		qcom,mst-enable;





		qcom,ext-disp = <&ext_disp>;

		qcom,ext-disp = <&ext_disp>;

		qcom,dp-aux-switch = <&fsa4480>;





		qcom,usbplug-cc-gpio = <&tlmm 104 0>;

		qcom,usbplug-cc-gpio = <&tlmm 104 0>;