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

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

Merge "ARM: dts: msm: enable displayport hpd through lphw gpio"

parents f362f0c4 86869ea1

arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
&sm6150_snd {

	qcom,model = "trinket-idp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

	qcom,ext-disp-audio-rx = <0>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Analog Mic2",
@@ -227,8 +227,9 @@ 
	qcom,msm-mbhc-gnd-swh = <1>;

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	asoc-codec  = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	asoc-codec  = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

				"msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <1>;

	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,

			<&wsa881x_0213>, <&wsa881x_0214>;

arch/arm64/boot/dts/qcom/trinket-dp-idp-overlay.dts

+21 −0
Original line number Diff line number Diff line
@@ -28,3 +28,24 @@ 
&dsi_td4330_truly_cmd_display {

	qcom,dsi-display-active;

};



&sde_dp {

	status = "ok";

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

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

};



&mdss_dp_pll {

	status = "ok";

};



&usb0 {

	dwc3@4e00000 {

		usb-phy = <&qusb_phy0>, <&usb_nop_phy>;

		maximum-speed = "high-speed";

	};

};



&mdss_mdp {

	connectors = <&sde_wb &sde_dsi &sde_dp>;

};

arch/arm64/boot/dts/qcom/trinket-dp-idp.dts

+21 −0
Original line number Diff line number Diff line
@@ -21,3 +21,24 @@ 
	compatible = "qcom,trinket-idp", "qcom,trinket", "qcom,idp";

	qcom,board-id = <34 4>;

};



&sde_dp {

	status = "ok";

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

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

};



&mdss_dp_pll {

	status = "ok";

};



&usb0 {

	dwc3@4e00000 {

		usb-phy = <&qusb_phy0>, <&usb_nop_phy>;

		maximum-speed = "high-speed";

	};

};



&mdss_mdp {

	connectors = <&sde_wb &sde_dsi &sde_dp>;

};

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

+54 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,60 @@ 
			};

		};



		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {

			mux {

				pins = "gpio102";

				function = "gpio";

			};



			config {

				pins = "gpio102";

				bias-disable;

				drive-strength = <16>;

			};

		};



		sde_dp_usbplug_cc_suspend: sde_dp_usbplug_cc_suspend {

			mux {

				pins = "gpio102";

				function = "gpio";

			};



			config {

				pins = "gpio102";

				bias-pull-down;

				drive-strength = <2>;

			};

		};



		sde_dp_hotplug_ctrl: sde_dp_hotplug_ctrl {

			mux {

				pins = "gpio100";

				function = "dp_hot";

			};



			config {

				pins = "gpio100";

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

		};



		sde_dp_hotplug_tlmm: sde_dp_hotplug_tlmm {

			mux {

				pins = "gpio100";

				function = "gpio";

			};



			config {

				pins = "gpio100";

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

		};



		/* SDC pin type */

		sdc1_clk_on: sdc1_clk_on {

			config {

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

+41 −0
Original line number Diff line number Diff line
@@ -41,4 +41,45 @@ 
			};

		};

	};



	mdss_dp_pll: qcom,mdss_dp_pll@1616000 {

		status = "disabled";

		compatible = "qcom,mdss_dp_pll_14nm";

		label = "MDSS DP PLL";

		cell-index = <0>;

		#clock-cells = <1>;



		reg = <0x01616c00 0x1c4>,

		      <0x01616000 0x17c>,

		      <0x01616400 0x10c>,

		      <0x01616800 0x10c>,

		      <0x05f03000 0xc>;

		reg-names = "pll_base", "phy_base", "ln_tx0_base",

			"ln_tx1_base", "gdsc_base";



		clocks = <&clock_dispcc DISP_CC_MDSS_AHB_CLK>,

			 <&clock_rpmcc CXO_SMD_OTG_CLK>,

			 <&clock_gcc GCC_AHB2PHY_USB_CLK>,

			 <&clock_gcc GCC_USB3_PRIM_PHY_PIPE_CLK>,

			 <&clock_gcc GCC_USB3_PRIM_CLKREF_CLK>;

		clock-names = "iface_clk",

			"ref_clk_src",

			"cfg_ahb_clk",

			"gcc_iface", "ref_clk";

		clock-rate = <0>;



		gdsc-supply = <&mdss_core_gdsc>;

		qcom,platform-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;

			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "gdsc";

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

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

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

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

			};

		};

	};

};