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

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

Merge "msm: hdmi: Add APQ8084 HDMI MUX GPIO settings"

parents 5353df8f aa45b058

Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ Optional properties: 
  property for liquid devices.

- qcom,hdmi-tx-mux-en: gpio required to enable mux for HDMI output

  on liquid devices. Required property for liquid devices.

- qcom,hdmi-tx-mux-lpm: gpio required for hdmi mux configuration

  selection on liquid devices. Required property for liquid devices.

- qcom,hdmi-tx-ext-5v: gpio required to enable 5V boost.



[Optional child nodes]: These nodes are for devices which are

dependent on HDMI Tx controller. If HDMI Tx controller is disabled then
@@ -64,6 +67,11 @@ Example: 
		qcom,hdmi-tx-ddc-clk = <&msmgpio 32 0>;

		qcom,hdmi-tx-ddc-data = <&msmgpio 33 0>;

		qcom,hdmi-tx-hpd = <&msmgpio 34 0>;

		qcom,hdmi-tx-ext-5v = <&pma8084_mpps 3 0>;



		qcom,hdmi-tx-mux-lpm = <&msmgpio 27 0>;

		qcom,hdmi-tx-mux-en = <&msmgpio 83 0>;

		qcom,hdmi-tx-mux-sel = <&msmgpio 85 0>;



		qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

drivers/video/msm/mdss/mdss_hdmi_tx.c

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ struct dss_gpio hpd_gpio_config[] = { 
	{0, 1, COMPATIBLE_NAME "-hpd"},

	{0, 1, COMPATIBLE_NAME "-ext-5v"},

	{0, 1, COMPATIBLE_NAME "-mux-en"},

	{0, 0, COMPATIBLE_NAME "-mux-sel"}

	{0, 0, COMPATIBLE_NAME "-mux-sel"},

	{0, 1, COMPATIBLE_NAME "-mux-lpm"}

};



struct dss_gpio ddc_gpio_config[] = {