ARM: dts: msm: clean up display device tree for MSM8996

Display device setting for MSM8996 scattered in different files.
Need to clean up and consolidate display entries into platform
specific files.

Signed-off-by: Paresh Purabhiya <ppurab@codeaurora.org>
Change-Id: I49d45e77b9353c7f84f0f6058e15ed4b89e305d9

diff --git a/arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi
index e731c7e..1ea94d5 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, 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
@@ -13,6 +13,7 @@
 #include "msm8996-pinctrl.dtsi"
 #include "apq8096-camera-sensor-dragonboard.dtsi"
 #include "apq8096-ba.dtsi"
+#include "msm8996-mdss-panels.dtsi"
 
 / {
        bluetooth: bt_qca6174 {
@@ -326,8 +327,6 @@
        };
 };
 
-#include "msm8996-sde-display.dtsi"
-
 &dsi_hx8379a_fwvga_truly_vid {
        qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
        qcom,mdss-dsi-bl-min-level = <1>;

diff --git a/arch/arm/boot/dts/qcom/apq8096-v2-auto-dragonboard.dts b/arch/arm/boot/dts/qcom/apq8096-v2-auto-dragonboard.dts
index d200bf7..575b85d 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-v2-auto-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v2-auto-dragonboard.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015,2018, 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
@@ -14,6 +14,7 @@
 /dts-v1/;
 
 #include "apq8096-v2.dtsi"
+#include "msm8996-sde.dtsi"
 #include "apq8096-auto-dragonboard.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-auto-dragonboard.dts b/arch/arm/boot/dts/qcom/apq8096-v3-auto-dragonboard.dts
index 0f8e148..7028d37 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-v3-auto-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom/apq8096-v3-auto-dragonboard.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015,2018, 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
@@ -14,6 +14,7 @@
 /dts-v1/;
 
 #include "apq8096-v3.dtsi"
+#include "msm8996-sde.dtsi"
 #include "apq8096-auto-dragonboard.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 9e14211..2adfb8b 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -13,6 +13,7 @@
 #include "msm8996-pinctrl.dtsi"
 #include "msm8996-camera-sensor-adp.dtsi"
 #include "msm8996-wsa881x.dtsi"
+#include "msm8996-sde.dtsi"
 
 / {
        bluetooth: bt_qca6174 {

diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 5c08acb..9229a62 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -13,6 +13,7 @@
 #include "msm8996-pinctrl.dtsi"
 #include "msm8996-camera-sensor-auto-cdp.dtsi"
 #include "msm8996-wsa881x.dtsi"
+#include "msm8996-sde.dtsi"
 
 / {
        bluetooth: bt_qca6174 {

diff --git a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
index 6fafb8b..f544934 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-cdp.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016,2018, 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
@@ -340,7 +340,6 @@
        };
 };
 
-#include "msm8996-sde-display.dtsi"
 #include "msm8996-mdss-panels.dtsi"
 
 &mdss_mdp {
@@ -400,7 +399,6 @@
        qcom,mdss-dsi-bl-min-level = <1>;
        qcom,mdss-dsi-bl-max-level = <4095>;
        qcom,cont-splash-enabled;
-       qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;
        qcom,platform-reset-gpio = <&tlmm 8 0>;
        qcom,platform-bklight-en-gpio = <&pm8994_gpios 14 0>;
        qcom,5v-boost-gpio = <&pmi8994_gpios 8 0>;

diff --git a/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi b/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
index 3223d87..c06a44c 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi
@@ -190,12 +190,6 @@
        };
 };
 
-/delete-node/ &sde_kms;
-/delete-node/ &sde_dsi0;
-/delete-node/ &sde_dsi1;
-/delete-node/ &sde_dsi_phy0;
-/delete-node/ &sde_dsi_phy1;
-/delete-node/ &sde_hdmi_tx;
 /delete-node/ &mdss_mdp;
 /delete-node/ &mdss_dsi;
 /delete-node/ &msm_ext_disp;

diff --git a/arch/arm/boot/dts/qcom/msm8996-dtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-dtp.dtsi
index c2667b4..23709bf 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-dtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-dtp.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016,2018, 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
@@ -11,9 +11,9 @@
  */
 
 #include "msm8996-pinctrl.dtsi"
-#include "msm8996-sde-display.dtsi"
 #include "msm8996-camera-sensor-dtp.dtsi"
 #include "msm8996-wsa881x.dtsi"
+#include "msm8996-mdss-panels.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. MSM8996 DTP";

diff --git a/arch/arm/boot/dts/qcom/msm8996-fluid.dtsi b/arch/arm/boot/dts/qcom/msm8996-fluid.dtsi
index 86bc809..de63afe 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-fluid.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-fluid.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016,2018, 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
@@ -587,7 +587,6 @@
        status = "ok";
 };
 
-#include "msm8996-sde-display.dtsi"
 #include "msm8996-mdss-panels.dtsi"
 
 &mdss_mdp {

diff --git a/arch/arm/boot/dts/qcom/msm8996-liquid.dtsi b/arch/arm/boot/dts/qcom/msm8996-liquid.dtsi
index 571e67a..3eef360 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-liquid.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-liquid.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016,2018, 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
@@ -294,12 +294,16 @@
        };
 };
 
-#include "msm8996-sde-display.dtsi"
+#include "msm8996-mdss-panels.dtsi"
 
 &mdss_mdp {
        qcom,mdss-pref-prim-intf = "dsi";
 };
 
+&mdss_dsi {
+       hw-config = "split_dsi";
+};
+
 &mdss_dsi0 {
        qcom,dsi-pref-prim-pan = <&dsi_dual_jdi_4k_nofbc_video>;
        pinctrl-names = "mdss_default", "mdss_sleep";

diff --git a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi
index 24f593a..9442239 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2018, 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
@@ -336,21 +336,12 @@
        };
 };
 
-#include "msm8996-sde-display.dtsi"
 #include "msm8996-mdss-panels.dtsi"
 
 &mdss_mdp {
        qcom,mdss-pref-prim-intf = "dsi";
 };
 
-&sde_hdmi {
-       status = "ok";
-};
-
-&mdss_dsi {
-       hw-config = "split_dsi";
-};
-
 &mdss_dsi0 {
        qcom,dsi-pref-prim-pan = <&dsi_dual_sharp_video>;
        pinctrl-names = "mdss_default", "mdss_sleep";
@@ -385,7 +376,7 @@
        qcom,mdss-dsi-bl-min-level = <1>;
        qcom,mdss-dsi-bl-max-level = <4095>;
        qcom,cont-splash-enabled;
-       qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;
+       qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
        qcom,platform-reset-gpio = <&tlmm 8 0>;
        qcom,platform-bklight-en-gpio = <&pm8994_gpios 14 0>;
        qcom,5v-boost-gpio = <&pmi8994_gpios 8 0>;

diff --git a/arch/arm/boot/dts/qcom/msm8996-v2.dtsi b/arch/arm/boot/dts/qcom/msm8996-v2.dtsi
index 698c019..db62370 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-v2.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2018, 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
@@ -480,11 +480,7 @@
        gdsc-venus-supply = <&gdsc_venus>;
 };
 
-&sde_hdmi_tx {
-       hpd-gdsc-venus-supply = <&gdsc_venus>;
-};
-
-&mdss_dsi0 {
+&mdss_dsi {
        gdsc-venus-supply = <&gdsc_venus>;
        qcom,core-supply-entries {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index 2d30aab..efc91f9 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -266,7 +266,6 @@
 };
 
 #include "msm8996-ion.dtsi"
-#include "msm8996-sde.dtsi"
 #include "msm8996-mdss.dtsi"
 #include "msm8996-mdss-pll.dtsi"
 #include "msm8996-smp2p.dtsi"