Merge "ARM: dts: msm: primary disp pref for msm8226"
diff --git a/arch/arm/boot/dts/dsi-panel-hx8394a-720p-video.dtsi b/arch/arm/boot/dts/dsi-panel-hx8394a-720p-video.dtsi
index c8d150a..c9d887b 100644
--- a/arch/arm/boot/dts/dsi-panel-hx8394a-720p-video.dtsi
+++ b/arch/arm/boot/dts/dsi-panel-hx8394a-720p-video.dtsi
@@ -15,10 +15,8 @@
* Update input XML file to add a new entry or update variable in this file
* VERSION = "1.0"
*---------------------------------------------------------------------------*/
-&soc {
- qcom,mdss_dsi_hx8394a_720p_video {
- compatible = "qcom,mdss-dsi-panel";
- status = "disable";
+&mdss_mdp {
+ dsi_hx8394a_720_vid: qcom,mdss_dsi_hx8394a_720p_video {
qcom,mdss-dsi-panel-name = "hx8394a 720p video mode dsi panel";
qcom,mdss-dsi-panel-controller = <&mdss_dsi0>;
qcom,mdss-dsi-panel-type = "dsi_video_mode";
diff --git a/arch/arm/boot/dts/dsi-panel-nt35521-720p-video.dtsi b/arch/arm/boot/dts/dsi-panel-nt35521-720p-video.dtsi
index 0b3fec4..357b024 100644
--- a/arch/arm/boot/dts/dsi-panel-nt35521-720p-video.dtsi
+++ b/arch/arm/boot/dts/dsi-panel-nt35521-720p-video.dtsi
@@ -15,10 +15,8 @@
* Update input XML file to add a new entry or update variable in this file
* VERSION = "1.0"
*---------------------------------------------------------------------------*/
-&soc {
- qcom,mdss_dsi_nt35521_720p_video {
- compatible = "qcom,mdss-dsi-panel";
- status = "disable";
+&mdss_mdp {
+ dsi_nt35521_720_vid: qcom,mdss_dsi_nt35521_720p_video {
qcom,mdss-dsi-panel-name = "nt35521 720p video mode dsi panel";
qcom,mdss-dsi-panel-controller = <&mdss_dsi0>;
qcom,mdss-dsi-panel-type = "dsi_video_mode";
diff --git a/arch/arm/boot/dts/dsi-panel-nt35596-1080p-video.dtsi b/arch/arm/boot/dts/dsi-panel-nt35596-1080p-video.dtsi
index 998799a..49aef24 100644
--- a/arch/arm/boot/dts/dsi-panel-nt35596-1080p-video.dtsi
+++ b/arch/arm/boot/dts/dsi-panel-nt35596-1080p-video.dtsi
@@ -15,10 +15,8 @@
* Update input XML file to add a new entry or update variable in this file
* VERSION = "1.0"
*---------------------------------------------------------------------------*/
-&soc {
- qcom,mdss_dsi_nt35596_1080p_video {
- compatible = "qcom,mdss-dsi-panel";
- status = "disable";
+&mdss_mdp {
+ dsi_nt35596_1080_vid: qcom,mdss_dsi_nt35596_1080p_video {
qcom,mdss-dsi-panel-name = "nt35596 1080p video mode dsi panel";
qcom,mdss-dsi-panel-controller = <&mdss_dsi0>;
qcom,mdss-dsi-panel-type = "dsi_video_mode";
diff --git a/arch/arm/boot/dts/msm8226-cdp.dtsi b/arch/arm/boot/dts/msm8226-cdp.dtsi
index 253ce3f..f23db49 100644
--- a/arch/arm/boot/dts/msm8226-cdp.dtsi
+++ b/arch/arm/boot/dts/msm8226-cdp.dtsi
@@ -18,11 +18,6 @@
status = "ok";
};
- qcom,mdss_dsi_nt35590_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
-
i2c@f9927000 { /* BLSP1 QUP5 */
synaptics@20 {
compatible = "synaptics,rmi4";
@@ -462,3 +457,15 @@
qcom,fast-avg-setup = <0>;
};
};
+
+&mdss_mdp {
+ qcom,mdss-pref-prim-intf = "dsi";
+};
+
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35590_720_vid>;
+};
+
+&dsi_nt35590_720_vid {
+ qcom,cont-splash-enabled;
+};
diff --git a/arch/arm/boot/dts/msm8226-mtp.dtsi b/arch/arm/boot/dts/msm8226-mtp.dtsi
index 68621fc..360abd0 100644
--- a/arch/arm/boot/dts/msm8226-mtp.dtsi
+++ b/arch/arm/boot/dts/msm8226-mtp.dtsi
@@ -18,11 +18,6 @@
status = "ok";
};
- qcom,mdss_dsi_nt35590_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
-
i2c@f9927000 { /* BLSP1 QUP5 */
synaptics@20 {
compatible = "synaptics,rmi4";
@@ -484,3 +479,15 @@
qcom,cdc-micbias1-ext-cap;
};
};
+
+&mdss_mdp {
+ qcom,mdss-pref-prim-intf = "dsi";
+};
+
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35590_720_vid>;
+};
+
+&dsi_nt35590_720_vid {
+ qcom,cont-splash-enabled;
+};
diff --git a/arch/arm/boot/dts/msm8226-qrd.dtsi b/arch/arm/boot/dts/msm8226-qrd.dtsi
index 88c44e6..deaebd0 100644
--- a/arch/arm/boot/dts/msm8226-qrd.dtsi
+++ b/arch/arm/boot/dts/msm8226-qrd.dtsi
@@ -474,3 +474,15 @@
&android_usb {
qcom,android-usb-cdrom;
};
+
+&mdss_mdp {
+ qcom,mdss-pref-prim-intf = "dsi";
+};
+
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35596_1080_vid>;
+};
+
+&dsi_nt35596_1080_vid {
+ qcom,cont-splash-enabled;
+};
diff --git a/arch/arm/boot/dts/msm8226-v1-qrd-dvt.dts b/arch/arm/boot/dts/msm8226-v1-qrd-dvt.dts
index 4acfa0f..a279e2e 100644
--- a/arch/arm/boot/dts/msm8226-v1-qrd-dvt.dts
+++ b/arch/arm/boot/dts/msm8226-v1-qrd-dvt.dts
@@ -29,9 +29,10 @@
<223 0x2000b 0>;
};
-&soc {
- qcom,mdss_dsi_hx8394a_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_hx8394a_720_vid>;
+};
+
+&dsi_hx8394a_720_vid {
+ qcom,cont-splash-enabled;
};
diff --git a/arch/arm/boot/dts/msm8226-v1-qrd-evt.dts b/arch/arm/boot/dts/msm8226-v1-qrd-evt.dts
index 507a92a..9e93dd9 100644
--- a/arch/arm/boot/dts/msm8226-v1-qrd-evt.dts
+++ b/arch/arm/boot/dts/msm8226-v1-qrd-evt.dts
@@ -29,9 +29,10 @@
<223 11 0>;
};
-&soc {
- qcom,mdss_dsi_nt35590_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35590_720_vid>;
+};
+
+&dsi_nt35590_720_vid {
+ qcom,cont-splash-enabled;
};
diff --git a/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts b/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
index faad6f3..fcbb135 100644
--- a/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
+++ b/arch/arm/boot/dts/msm8226-v1-qrd-skuf.dts
@@ -22,11 +22,6 @@
};
&soc {
- qcom,mdss_dsi_nt35521_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
-
sound {
qcom,model = "msm8226-tapan-skuf-snd-card";
@@ -176,3 +171,11 @@
&pm8226_chg {
qcom,battery-data = <&qrd_batterydata>;
};
+
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35521_720_vid>;
+};
+
+&dsi_nt35521_720_vid {
+ qcom,cont-splash-enabled;
+};
diff --git a/arch/arm/boot/dts/msm8226-v2-qrd-dvt.dts b/arch/arm/boot/dts/msm8226-v2-qrd-dvt.dts
index 9cf8224..f5e9d6e 100644
--- a/arch/arm/boot/dts/msm8226-v2-qrd-dvt.dts
+++ b/arch/arm/boot/dts/msm8226-v2-qrd-dvt.dts
@@ -29,11 +29,12 @@
<223 0x2000b 0x20000>;
};
-&soc {
- qcom,mdss_dsi_hx8394a_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_hx8394a_720_vid>;
+};
+
+&dsi_hx8394a_720_vid {
+ qcom,cont-splash-enabled;
};
&pm8226_bms {
diff --git a/arch/arm/boot/dts/msm8226-v2-qrd-evt.dts b/arch/arm/boot/dts/msm8226-v2-qrd-evt.dts
index 98de659..fd64b28 100644
--- a/arch/arm/boot/dts/msm8226-v2-qrd-evt.dts
+++ b/arch/arm/boot/dts/msm8226-v2-qrd-evt.dts
@@ -29,9 +29,10 @@
<223 11 0x20000>;
};
-&soc {
- qcom,mdss_dsi_nt35590_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35590_720_vid>;
+};
+
+&dsi_nt35590_720_vid {
+ qcom,cont-splash-enabled;
};
diff --git a/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts b/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
index 0d89e00..c3367ae 100644
--- a/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
+++ b/arch/arm/boot/dts/msm8226-v2-qrd-skuf.dts
@@ -22,11 +22,6 @@
};
&soc {
- qcom,mdss_dsi_nt35521_720p_video {
- status = "ok";
- qcom,cont-splash-enabled;
- };
-
sound {
qcom,model = "msm8226-tapan-skuf-snd-card";
@@ -181,3 +176,11 @@
&pm8226_iadc {
qcom,rsense = <10000000>;
};
+
+&mdss_dsi0 {
+ qcom,dsi-pref-prim-pan = <&dsi_nt35521_720_vid>;
+};
+
+&dsi_nt35521_720_vid {
+ qcom,cont-splash-enabled;
+};