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

Commit 15df0cc0 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: enable ADV7533 chip for msmtitanium"

parents 499f44cb d693cad7

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

+11 −0
Original line number Diff line number Diff line
@@ -294,4 +294,15 @@ 
		qcom,master-en = <1>;

		status = "okay";

	};



	/* GPIO 5 (ADV7533 DSI2HDMI) */

	gpio@c400 {

		status = "ok";

		qcom,mode = <1>;

		qcom,vin-sel = <0>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		qcom,out-strength = <2>;

	};



};

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

+17 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -94,3 +94,19 @@ 
		24 1f 08 09 05 03 04 a0

		24 1b 08 09 05 03 04 a0];

};



&dsi_adv7533_1080p {

	qcom,mdss-dsi-panel-timings-8996 = [24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1b 08 09 05 03 04 a0];

};



&dsi_adv7533_720p {

	qcom,mdss-dsi-panel-timings-8996 = [1e 1b 04 06 02 03 04 a0

		1e 1b 04 06 02 03 04 a0

		1e 1b 04 06 02 03 04 a0

		1e 1b 04 06 02 03 04 a0

		1e 0e 04 05 02 03 04 a0];

};

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

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

		};



		pmx_adv7533_int: pmx_adv7533_int {

			adv7533_int_active: adv7533_int_active {

				mux {

					pins = "gpio90";

					function = "gpio";

				};



				config {

					pins = "gpio90";

					drive-strength = <16>;

					bias-disable;

				};

			};



			adv7533_int_suspend: adv7533_int_suspend {

				mux {

					pins = "gpio90";

					function = "gpio";

				};



				config {

					pins = "gpio90";

					drive-strength = <16>;

					bias-disable;

				};

			};



		};



		pmx_mdss: pmx_mdss {

			mdss_dsi_active: mdss_dsi_active {

				mux {

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

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -460,4 +460,12 @@ 
		enable-active-high;

		gpio = <&tlmm 50 0>;

	};



	adv_vreg: adv_vreg {

		compatible = "regulator-fixed";

		regulator-name = "adv_vreg";

		startup-delay-us = <400>;

		enable-avtive-high;

		gpio = <&pmtitanium_gpios 5 0>;

	};

};

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

+22 −0
Original line number Diff line number Diff line
@@ -642,6 +642,28 @@ 
		dmas = <&dma_blsp1 6 64 0x20000020 0x20>,

			<&dma_blsp1 7 32 0x20000020 0x20>;

		dma-names = "tx", "rx";



		/* 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 90 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_5: i2c@7af5000 { /* BLSP2 QUP1 */