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

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

Merge "ARM: msm: dts: add support for adv bridge chip to msm8937"

parents fc374dff d7f96761

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

+12 −3
Original line number Diff line number Diff line
@@ -58,6 +58,15 @@ 
		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};



	gpio@c700 {

		status = "ok";

		qcom,mode = <1>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};

};



&soc {
@@ -354,7 +363,7 @@ 
};



&mdss_dsi {

	hw-config = "single_dsi";

	hw-config = "dual_dsi";

};



&mdss_dsi0 {
@@ -370,12 +379,12 @@ 
};



&mdss_dsi1 {

	status = "disabled";

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

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

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,pluggable;

	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-enable-gpio = <&tlmm 99 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

arch/arm/boot/dts/qcom/msm8937-mdss-panels.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include "dsi-panel-r69006-1080p-cmd.dtsi"

#include "dsi-panel-r69006-1080p-video.dtsi"

#include "dsi-panel-hx8394f-720p-video.dtsi"

#include "dsi-adv7533-1080p.dtsi"

#include "dsi-adv7533-720p.dtsi"



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {

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

+29 −0
Original line number Diff line number Diff line
@@ -395,6 +395,35 @@ 
			};

		};



		pmx_adv7533_int: pmx_adv7533_int {

			adv7533_int_active: adv7533_int_active {

				mux {

					pins = "gpio126";

					function = "gpio";

				};



				config {

					pins = "gpio126";

					drive-strength = <16>;

					bias-disable;

				};

			};



			adv7533_int_suspend: adv7533_int_suspend {

				mux {

					pins = "gpio126";

					function = "gpio";

				};



				config {

					pins = "gpio126";

					drive-strength = <16>;

					bias-disable;

				};

			};



		};



		pmx_mdss: pmx_mdss {

			mdss_dsi_active: mdss_dsi_active {

				mux {

arch/arm/boot/dts/qcom/msm8937-regulator.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -413,4 +413,13 @@ 
		gpio = <&pm8937_gpios 7 0>;

		regulator-always-on;

	};



	adv_vreg: adv_vreg {

		compatible = "regulator-fixed";

		regulator-name = "adv_vreg";

		startup-delay-us = <400>;

		enable-avtive-high;

		gpio = <&pm8937_gpios 8 0>;

	};



};

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

+22 −0
Original line number Diff line number Diff line
@@ -503,6 +503,28 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&usbc_int_default>;

		};



		/* 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;

			pinctrl-names = "pmx_adv7533_active",

						"pmx_adv7533_suspend";

			pinctrl-0 = <&adv7533_int_active>;

			pinctrl-1 = <&adv7533_int_suspend>;

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

			hpd-5v-en-supply = <&adv_vreg>;

			qcom,supply-names = "hpd-5v-en";

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

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

			qcom,enable-load = <0>;

			qcom,disable-load = <0>;

		};

	};



	i2c_3: i2c@78b7000 { /* BLSP1 QUP3 */