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

Commit d871aa00 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 display configuration for msmtitanium"

parents 81a90caa 16728525

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

+49 −0
Original line number Diff line number Diff line
@@ -139,6 +139,55 @@ 
	qcom,follow-otst2-rb-disabled;

};



#include "msmtitanium-mdss-panels.dtsi"



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



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

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

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

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

};



&mdss_dsi1 {

	status = "disabled";

	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 12 0>;

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

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

};



&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&dsi_truly_1080_vid {

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

};



&dsi_truly_1080_cmd {

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

};



&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

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

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "dsi-panel-sim-video.dtsi"

#include "dsi-panel-sim-cmd.dtsi"

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

#include "dsi-panel-truly-1080p-cmd.dtsi"

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

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



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdd";

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

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

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

		};



		qcom,panel-supply-entry@2 {

			reg = <2>;

			qcom,supply-name = "lab";

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

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

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

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

		};



		qcom,panel-supply-entry@3 {

			reg = <3>;

			qcom,supply-name = "ibb";

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

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

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

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

			qcom,supply-post-on-sleep = <10>;

		};

	};

};



&dsi_truly_1080_vid {

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

		23 1e 08 09 05 03 04 a0

		23 1e 08 09 05 03 04 a0

		23 1e 08 09 05 03 04 a0

		23 1a 08 09 05 03 04 a0];

};



&dsi_truly_1080_cmd {

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

		23 1e 08 09 05 03 04 a0

		23 1e 08 09 05 03 04 a0

		23 1e 08 09 05 03 04 a0

		23 1a 08 09 05 03 04 a0];

};

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

+49 −0
Original line number Diff line number Diff line
@@ -105,6 +105,55 @@ 
	qcom,follow-otst2-rb-disabled;

};



#include "msmtitanium-mdss-panels.dtsi"



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



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

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

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

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

};



&mdss_dsi1 {

	status = "disabled";

	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 12 0>;

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

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

};



&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&dsi_truly_1080_vid {

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

};



&dsi_truly_1080_cmd {

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

};



&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

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

+9 −1
Original line number Diff line number Diff line
@@ -698,8 +698,14 @@ 
	};



	clock_gcc_mdss: qcom,gcc-mdss@1800000 {

		compatible = "qcom,dummycc";

		compatible = "qcom,gcc-mdss-titanium";

		reg = <0x1800000 0x80000>;

		clock-names = "pclk0_src", "pclk1_src",

				"byte0_src", "byte1_src";

		clocks = <&mdss_dsi0_pll clk_dsi0pll_pixel_clk_mux>,

			<&mdss_dsi1_pll clk_dsi1pll_pixel_clk_mux>,

			<&mdss_dsi0_pll clk_dsi0pll_byte_clk_mux>,

			<&mdss_dsi1_pll clk_dsi1pll_byte_clk_mux>;

		#clock-cells = <1>;

	};
@@ -2084,6 +2090,8 @@ 
#include "msmtitanium-audio.dtsi"

#include "msm-gdsc-8916.dtsi"

#include "msmtitanium-camera.dtsi"

#include "msmtitanium-mdss.dtsi"

#include "msmtitanium-mdss-pll.dtsi"



&gdsc_venus {

	clock-names = "bus_clk", "core_clk";

include/dt-bindings/clock/msm-clocks-titanium.h

+16 −0
Original line number Diff line number Diff line
@@ -312,5 +312,21 @@ 


#define clk_audio_ap_clk				 0x312ac429

#define clk_audio_pmi_clk				 0xb7ba2274

/* external multimedia clocks */

#define clk_dsi0pll_pixel_clk_mux			 0x792379e1

#define clk_dsi0pll_byte_clk_mux			 0x60e83f06

#define clk_dsi0pll_byte_clk_src			 0xbbaa30be

#define clk_dsi0pll_pixel_clk_src			 0x45b3260f

#define clk_dsi0pll_n2_div_clk				 0x1474c213

#define clk_dsi0pll_post_n1_div_clk			 0xdab8c389

#define clk_dsi0pll_vco_clk				 0x15940d40

#define clk_dsi1pll_pixel_clk_mux			 0x36458019

#define clk_dsi1pll_byte_clk_mux			 0xb5a42b7b

#define clk_dsi1pll_byte_clk_src			 0x63930a8f

#define clk_dsi1pll_pixel_clk_src			 0x0e4c9b56

#define clk_dsi1pll_n2_div_clk				 0x2c9d4007

#define clk_dsi1pll_post_n1_div_clk			 0x03020041

#define clk_dsi1pll_vco_clk				 0x99797b50

#define clk_mdss_dsi1_vco_clk_src			 0xfcd15658



#endif