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

Commit 70a21259 authored by Dhaval Patel's avatar Dhaval Patel Committed by Gerrit - the friendly Code Review server
Browse files

Arm: dts: Primary disp perf for msm8x10 



Add primary display interface preference property
to mdss-mdp device node. This allows MDP to inform
each controller if it is confirgured as the preferred
primary panel interface. Move the panel devices under
the mdss-mdp device node from soc since panels will
no longer be considered a device. This change is required
to implement panel detection mechanism. Update mdss node
with 8x10 plaform specific GPIO and regulator settings.

Change-Id: I46687673f858d89d50aa5fa11bb2831acaf44ada
Signed-off-by: default avatarDhaval Patel <pdhaval@codeaurora.org>
parent 312649d1

arch/arm/boot/dts/msm8610-cdp.dtsi

+16 −4
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ 
			"AMIC2", "MIC BIAS Internal2";

		qcom,headset-jack-type-NC;

    };



	qcom,dsi_v2_truly_wvga_video {

		qcom,cont-splash-enabled;

	};

};



&i2c_cdc  {
@@ -414,3 +410,19 @@ 
	qcom,setb-gpios-pull = <0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>;

	qcom,setb-gpios-dir =  <2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2>;

};



&mdss_mdp {

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

};



&mdss_dsi0 {

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

};



&dsi_truly_wvga_vid {

	qcom,cont-splash-enabled;

};



&dsi_truly_wvga_cmd {

	qcom,cont-splash-enabled;

};

arch/arm/boot/dts/msm8610-mdss-panels.dtsi

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013, 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-truly-wvga-video.dtsi"

/include/ "dsi-panel-truly-wvga-cmd.dtsi"

/include/ "dsi-panel-nt35590-720p-video.dtsi"

/include/ "dsi-panel-otm8018b-fwvga-video.dtsi"

/include/ "dsi-panel-hx8379a-wvga-video.dtsi"

arch/arm/boot/dts/msm8610-mdss.dtsi

+57 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



&soc {

	qcom,mdss_mdp@fd900000 {

	mdss_mdp: qcom,mdss_mdp@fd900000 {

		compatible = "qcom,mdss_mdp3";

		reg = <0xfd900000 0x100000>;

		reg-names = "mdp_phys";
@@ -30,7 +30,62 @@ 
		cell-index = <0>;

		reg = <0xfdd00000 0x100000>;

		interrupts = <0 30 0>;

		vdda-supply = <&pm8110_l4>;

		vdd-supply = <&pm8110_l4>;

		vdda-supply = <&pm8110_l19>;

		vddio-supply = <&pm8110_l14>;

		qcom,mdss-fb-map = <&mdss_fb0>;

		qcom,mdss-mdp = <&mdss_mdp>;

		qcom,platform-reset-gpio = <&msmgpio 41 0>;

		qcom,platform-te-gpio = <&msmgpio 12 0>;

		qcom,platform-mode-gpio = <&msmgpio 7 0>;



		qcom,platform-reset-sequence = <1 20 0 2 1 20 2>;



		qcom,platform-strength-ctrl = [ff 06];

		qcom,platform-bist-ctrl = [03 03 00 00 0f 00];

		qcom,platform-regulator-settings = [02 08 05 00 20 03];

		qcom,platform-lane-config = [80 45 00 00 01 66

		80 45 00 00 01 66

		80 45 00 00 01 66

		80 45 00 00 01 66

		40 67 00 00 01 88];



		qcom,platform-supply-entry1 {

			qcom,supply-name = "vdd";

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

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

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

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

			qcom,supply-pre-on-sleep = <0>;

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

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <20>;

		};



		qcom,platform-supply-entry2 {

			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,supply-pre-on-sleep = <0>;

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

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};



		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

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

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

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

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

			qcom,supply-pre-on-sleep = <0>;

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

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

	};

};



/include/ "msm8610-mdss-panels.dtsi"

arch/arm/boot/dts/msm8610-mtp.dtsi

+16 −4
Original line number Diff line number Diff line
@@ -202,10 +202,6 @@ 
            "AMIC2", "MIC BIAS Internal2",

            "AMIC3", "MIC BIAS External";

    };



	qcom,dsi_v2_truly_wvga_video {

		qcom,cont-splash-enabled;

	};

};



&i2c_cdc  {
@@ -443,3 +439,19 @@ 
&pm8110_chg {

	qcom,battery-data = <&mtp_batterydata>;

};



&mdss_mdp {

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

};



&mdss_dsi0 {

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

};



&dsi_truly_wvga_vid {

	qcom,cont-splash-enabled;

};



&dsi_truly_wvga_cmd {

	qcom,cont-splash-enabled;

};

arch/arm/boot/dts/msm8610-qrd-skuaa.dtsi

+12 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 


        qcom,ext-spk-amp-gpio = <&msmgpio 92 0x0>;

    };



	qcom,dsi_v2_hx8379a_wvga_video {

		qcom,cont-splash-enabled;

	};

};



/ {
@@ -57,3 +53,15 @@ 
		qcom,scale-function = <7>;

	};

};



&mdss_mdp {

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

};



&mdss_dsi0 {

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

};



&dsi_hx8379a_wvga_vid {

	qcom,cont-splash-enabled;

};