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

Commit b79cf49d 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: Move support for ADV7533 to apq8096 auto dragonboard file"

parents 1bbdbd77 84aa60ac

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+99 −8
Original line number Diff line number Diff line
@@ -342,21 +342,67 @@ 
};



&mdss_dsi {

	hw-config = "single_dsi";

	hw-config = "split_dsi";

};



&mdss_dsi0 {

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

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active &mdss_disp_bkl_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend &mdss_disp_bkl_suspend>;

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

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

	qcom,platform-bklight-en-gpio = <&tlmm 135 0>;

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

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

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

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

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

			};



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

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

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

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

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

			};

	};

};



&mdss_dsi1 {

	status = "disabled";

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

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

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

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

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

			};



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

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

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

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

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

			};

	};

};



&labibb {
@@ -562,6 +608,51 @@ 
		};

	};



	i2c@75b6000 { /* BLSP8 */

		/* ADV7533 configuration */

		adv7533@3d {

			compatible = "adv7533";

			instance_id = <0>;

			reg = <0x3d>;

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

			adi,main-addr = <0x3D>;

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

			adi,enable-audio;

			pinctrl-names = "pmx_adv7533_active",

				"pmx_adv7533_suspend";

			pinctrl-0 = <&adv7533_0_int_active

				&adv7533_0_hpd_int_active

				&adv7533_0_switch_active>;

			pinctrl-1 = <&adv7533_0_int_suspend

				&adv7533_0_hpd_int_suspend

				&adv7533_0_switch_suspend>;

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

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 105 0x0>;

		};



		adv7533@39 {

			compatible = "adv7533";

			instance_id = <1>;

			reg = <0x39>;

			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_1_int_active

				&adv7533_1_hpd_int_active

				&adv7533_1_switch_active>;

			pinctrl-1 = <&adv7533_1_int_suspend

				&adv7533_1_hpd_int_suspend

				&adv7533_1_switch_suspend>;

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

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 107 0x0>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi

+8 −99
Original line number Diff line number Diff line
@@ -342,67 +342,21 @@ 
};



&mdss_dsi {

	hw-config = "split_dsi";

	hw-config = "single_dsi";

};



&mdss_dsi0 {

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

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

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

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

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

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

			};



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

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

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

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

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

			};

	};

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active &mdss_disp_bkl_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend &mdss_disp_bkl_suspend>;

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

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

	qcom,platform-bklight-en-gpio = <&tlmm 135 0>;

};



&mdss_dsi1 {

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

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

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

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

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

			};



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

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

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

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

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

			};

	};

	status = "disabled";

};



&labibb {
@@ -622,51 +576,6 @@ 
		};

	};



	i2c@75b6000 { /* BLSP8 */

		/* ADV7533 configuration */

		adv7533@3d {

			compatible = "adv7533";

			instance_id = <0>;

			reg = <0x3d>;

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

			adi,main-addr = <0x3D>;

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

			adi,enable-audio;

			pinctrl-names = "pmx_adv7533_active",

				"pmx_adv7533_suspend";

			pinctrl-0 = <&adv7533_0_int_active

				&adv7533_0_hpd_int_active

				&adv7533_0_switch_active>;

			pinctrl-1 = <&adv7533_0_int_suspend

				&adv7533_0_hpd_int_suspend

				&adv7533_0_switch_suspend>;

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

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 105 0x0>;

		};



		adv7533@39 {

			compatible = "adv7533";

			instance_id = <1>;

			reg = <0x39>;

			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_1_int_active

				&adv7533_1_hpd_int_active

				&adv7533_1_switch_active>;

			pinctrl-1 = <&adv7533_1_int_suspend

				&adv7533_1_hpd_int_suspend

				&adv7533_1_switch_suspend>;

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

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 107 0x0>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";