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

Commit e53b69ea authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add the lphw support for minidp hpd on sm6150"

parents dc42fca5 80b09ee6

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ display interfaces, e.g. Display Port, and the audio subsystem. 
Optional properties:

- qcom,ext-disp:		phandle for msm-ext-display module

- compatible:			Must be "qcom,msm-ext-disp"

- qcom,dp-low-power-hw-hpd:	Low power hardware HPD feature enable control node

- qcom,phy-version:		Phy version

- pinctrl-names:		List of names to assign mdss pin states defined in pinctrl device node

				Refer to pinctrl-bindings.txt

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

+16 −2
Original line number Diff line number Diff line
@@ -745,7 +745,21 @@ 
			};

		};



		sde_dp_hotplug_enable: sde_dp_hotplug_enable {

		sde_dp_hotplug_ctrl: sde_dp_hotplug_ctrl {

			mux {

				pins = "gpio103";

				function = "debug_hot";

			};



			config {

				pins = "gpio103";

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

		};



		sde_dp_hotplug_tlmm: sde_dp_hotplug_tlmm {

			mux {

				pins = "gpio103";

				function = "gpio";
@@ -753,7 +767,7 @@ 


			config {

				pins = "gpio103";

				bias-pull-down;

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

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

+21 −0
Original line number Diff line number Diff line
@@ -210,6 +210,27 @@ 


&sde_dp {

	qcom,dp-usbpd-detection = <&pm6150_pdphy>;

	hpd-pwr-supply = <&pm6150_l17>;

	qcom,phy-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;

		qcom,phy-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdda-0p9";

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

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

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

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

		};

		qcom,phy-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "hpd-pwr";

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

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

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

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

		};

	};

};



&mdss_mdp {

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

+5 −16
Original line number Diff line number Diff line
@@ -531,11 +531,14 @@ 
		qcom,usbplug-cc-gpio = <&tlmm 104 0>;



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

						"mdss_dp_hpd_active";

				"mdss_dp_hpd_active", "mdss_dp_hpd_tlmm",

				"mdss_dp_hpd_ctrl";

		pinctrl-0 = <&sde_dp_usbplug_cc_active &sde_dp_switch_active>;

		pinctrl-1 = <&sde_dp_usbplug_cc_suspend &sde_dp_switch_suspend>;

		pinctrl-2 = <&sde_dp_connector_enable &sde_dp_switch_suspend

						&sde_dp_hotplug_enable>;

						&sde_dp_hotplug_tlmm>;

		pinctrl-3 = <&sde_dp_hotplug_tlmm>;

		pinctrl-4 = <&sde_dp_hotplug_ctrl>;



		qcom,ctrl-supply-entries {

			#address-cells = <1>;
@@ -551,20 +554,6 @@ 
			};

		};



		qcom,phy-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,phy-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda-0p9";

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

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

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

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

			};

		};



		qcom,core-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm64/boot/dts/qcom/sm6150-usbc-minidp-idp-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ 


&sde_dp {

	qcom,dp-hpd-gpio = <&tlmm 103 0>;

	qcom,dp-low-power-hw-hpd;

};