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

Commit 535bdc5f 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 support for hpd on 8017 qsap platform"

parents 01f19b2f 37ed7c8f

arch/arm/boot/dts/qcom/apq8017-no-pmi-wcd-rome-cdp.dts

+4 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		adi,main-addr = <0x39>;

		adi,cec-dsi-addr = <0x3C>;

		adi,enable-audio;

		adi,irq-gpio = <&tlmm 0x7E 0x2002>;

		adi,irq-gpio = <&tlmm 0x29 0x2002>;

		adi,power-down-gpio = <&tlmm 0x7D 0x0>;

		adi,switch-gpio = <&pm8937_gpios 0x8 0x1>;

		pinctrl-names = "pmx_adv7533_active",
@@ -82,13 +82,14 @@ 
};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_720p>;

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;

	qcom,platform-intf-mux-gpio = <&tlmm 115 0>;

	status = "ok";

	qcom,bridge-index = <0>;

	qcom,pluggable;

};



&dsi_adv7533_720p {

&dsi_adv7533_1080p {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};

arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp-wcd-rome.dts

+36 −0
Original line number Diff line number Diff line
@@ -475,3 +475,39 @@ 
};



/delete-node/ &cont_splash_mem;



&i2c_2 {

	/* DSI_TO_HDMI I2C configuration */

	adv7533@39 {

		compatible = "adv7533";

		reg = <0x39>;

		instance_id = <0>;

		adi,video-mode = <3>; /* 3 = 1080p */

		adi,main-addr = <0x39>;

		adi,cec-dsi-addr = <0x3C>;

		adi,enable-audio;

		adi,irq-gpio = <&tlmm 0x29 0x2002>;

		adi,power-down-gpio = <&tlmm 0x7D 0x0>;

		adi,switch-gpio = <&pm8937_gpios 0x8 0x1>;

		pinctrl-names = "pmx_adv7533_active",

					"pmx_adv7533_suspend";

		pinctrl-0 = <&adv7533_int_active>;

		pinctrl-1 = <&adv7533_int_suspend>;

	};

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;

	qcom,platform-intf-mux-gpio = <&tlmm 115 0>;

	status = "ok";

	qcom,bridge-index = <0>;

	qcom,pluggable;

};



&dsi_adv7533_1080p {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};

arch/arm/boot/dts/qcom/apq8017-pmi8950-mtp.dts

+4 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
		adi,main-addr = <0x39>;

		adi,cec-dsi-addr = <0x3C>;

		adi,enable-audio;

		adi,irq-gpio = <&tlmm 0x7E 0x2002>;

		adi,irq-gpio = <&tlmm 0x29 0x2002>;

		adi,power-down-gpio = <&tlmm 0x7D 0x0>;

		adi,switch-gpio = <&pm8937_gpios 0x8 0x1>;

		pinctrl-names = "pmx_adv7533_active",
@@ -52,12 +52,13 @@ 
};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_720p>;

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;

	qcom,platform-intf-mux-gpio = <&tlmm 115 0>;

	status = "ok";

	qcom,bridge-index = <0>;

	qcom,pluggable;

};



&dsi_adv7533_720p {

&dsi_adv7533_1080p {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};

arch/arm/boot/dts/qcom/apq8017.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
	pmx_adv7533_int: pmx_adv7533_int {

		adv7533_int_active: adv7533_int_active {

			mux {

				pins = "gpio125", "gpio126";

				pins = "gpio41";

				function = "gpio";

			};



			config {

				pins = "gpio125", "gpio126";

				pins = "gpio41";

				function = "gpio";

				drive-strength = <16>;

				bias-pull-up; /* pull up */
@@ -36,12 +36,12 @@ 


		adv7533_int_suspend: adv7533_int_suspend {

			mux {

				pins = "gpio125", "gpio126";

				pins = "gpio41";

				function = "gpio";

			};



			config {

				pins = "gpio125", "gpio126";

				pins = "gpio41";

				drive-strength = <16>;

				bias-disable;

			};