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
This commit is contained in:
Paresh Purabhiya 2017-10-31 19:46:33 +05:30 committed by Camus Wong
parent 4b6c5fa539
commit d6696e3622
13 changed files with 22 additions and 38 deletions

View file

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

View file

@ -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"
/ {

View file

@ -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"
/ {

View file

@ -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 {

View file

@ -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 {

View file

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

View file

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

View file

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

View file

@ -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 {

View file

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

View file

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

View file

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

View file

@ -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"