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

Commit fd5a9d02 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: add HDMI pinctrl to msm8994"

parents e3e080de 8a290f2e

arch/arm/boot/dts/qcom/msm8994-cdp.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -275,6 +275,37 @@ 
	qcom,mdss-dsi-bl-max-level = <4095>;

};



&pmx_hdmi_cec {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 31>;

};



&pmx_hdmi_ddc {

	qcom,num-grp-pins = <2>;

	qcom,pins = <&gp 32>, <&gp 33>;

};



&pmx_hdmi_hpd {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 34>;

};



&mdss_hdmi_tx {

	pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active",

				"hdmi_cec_active", "hdmi_active",

				"hdmi_sleep";

	pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

	pinctrl-1 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active

						&mdss_hdmi_cec_suspend>;

	pinctrl-2 = <&mdss_hdmi_hpd_active &mdss_hdmi_cec_active

						&mdss_hdmi_ddc_suspend>;

	pinctrl-3 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active

						&mdss_hdmi_cec_active>;

	pinctrl-4 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

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

+31 −0
Original line number Diff line number Diff line
@@ -275,6 +275,37 @@ 
	qcom,mdss-dsi-bl-max-level = <4095>;

};



&pmx_hdmi_cec {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 31>;

};



&pmx_hdmi_ddc {

	qcom,num-grp-pins = <2>;

	qcom,pins = <&gp 32>, <&gp 33>;

};



&pmx_hdmi_hpd {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 34>;

};



&mdss_hdmi_tx {

	pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active",

				"hdmi_cec_active", "hdmi_active",

				"hdmi_sleep";

	pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

	pinctrl-1 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active

						&mdss_hdmi_cec_suspend>;

	pinctrl-2 = <&mdss_hdmi_hpd_active &mdss_hdmi_cec_active

						&mdss_hdmi_ddc_suspend>;

	pinctrl-3 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active

						&mdss_hdmi_cec_active>;

	pinctrl-4 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

arch/arm/boot/dts/qcom/msm8994-pinctrl.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -81,6 +81,45 @@ 
			};

		};



		pmx_hdmi_cec: pmx_hdmi_cec {

			qcom,pin-func = <1>;

			label = "hdmi-cec-pins";

			mdss_hdmi_cec_active: cec_active {

				drive-strength = <2>;

				bias-pull-up;

			};

			mdss_hdmi_cec_suspend: cec_suspend {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		pmx_hdmi_ddc: pmx_hdmi_ddc {

			qcom,pin-func = <1>;

			label = "hdmi-ddc-pins";

			mdss_hdmi_ddc_active: ddc_active {

				drive-strength = <2>;

				bias-pull-up;

			};

			mdss_hdmi_ddc_suspend: ddc_suspend {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		pmx_hdmi_hpd: pmx_hdmi_hpd {

			qcom,pin-func = <1>;

			label = "hdmi-hpd-pin";

			mdss_hdmi_hpd_active: hpd_active {

				drive-strength = <16>;

				bias-pull-down;

			};

			mdss_hdmi_hpd_suspend: hpd_suspend {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		spi_0 {

			qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;

			qcom,num-grp-pins = <3>;