evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: rename mdss_mdp to sde_kms for msm8996"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-14 04:01:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit de4967ee70
7 changed files with 39 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
View file

@ -547,7 +547,7 @@
#include "msm8996-sde-display.dtsi" #include "msm8996-sde-display.dtsi"
&mdss_mdp { &sde_kms {
qcom,mdss-pref-prim-intf = "dsi"; qcom,mdss-pref-prim-intf = "dsi";
qcom,sde-plane-id-map { qcom,sde-plane-id-map {
qcom,sde-plane-id@0 { qcom,sde-plane-id@0 {

2
arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
View file

@ -333,7 +333,7 @@
}; };
}; };
&mdss_mdp { &sde_kms {
qcom,mdss-pref-prim-intf = "dsi"; qcom,mdss-pref-prim-intf = "dsi";
qcom,sde-plane-id-map { qcom,sde-plane-id-map {
qcom,sde-plane-id@0 { qcom,sde-plane-id@0 {

4
arch/arm/boot/dts/qcom/msm8996-mtp.dtsi
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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -343,7 +343,7 @@
qcom,mdss-pref-prim-intf = "dsi"; qcom,mdss-pref-prim-intf = "dsi";
}; };
&mdss_hdmi { &sde_hdmi {
status = "ok"; status = "ok";
}; };

40
arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi
View file

@ -94,8 +94,8 @@
label = "dsi_dual_sharp_video"; label = "dsi_dual_sharp_video";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>; qcom,dsi-ctrl = <&sde_dsi0 &sde_dsi1>;
qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>; qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -118,8 +118,8 @@
label = "single_dsi_sim"; label = "single_dsi_sim";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0>; qcom,dsi-phy = <&sde_dsi_phy0>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -140,8 +140,8 @@
label = "single_dsi_toshiba_720p"; label = "single_dsi_toshiba_720p";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0>; qcom,dsi-phy = <&sde_dsi_phy0>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -161,8 +161,8 @@
label = "single_dsi_jdi_1080p"; label = "single_dsi_jdi_1080p";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0>; qcom,dsi-phy = <&sde_dsi_phy0>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -180,8 +180,8 @@
label = "single_dsi_sharp_1080p"; label = "single_dsi_sharp_1080p";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0>; qcom,dsi-phy = <&sde_dsi_phy0>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -209,8 +209,8 @@
qcom,display-type = "primary"; qcom,display-type = "primary";
/* dsi1/dsi0 swapped due to IMGSWAP */ /* dsi1/dsi0 swapped due to IMGSWAP */
qcom,dsi-ctrl = <&mdss_dsi1 &mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi1 &sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>; qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -231,8 +231,8 @@
label = "dsi_dual_nt35597_video"; label = "dsi_dual_nt35597_video";
qcom,display-type = "primary"; qcom,display-type = "primary";
qcom,dsi-ctrl = <&mdss_dsi0 &mdss_dsi1>; qcom,dsi-ctrl = <&sde_dsi0 &sde_dsi1>;
qcom,dsi-phy = <&mdss_dsi_phy0 &mdss_dsi_phy1>; qcom,dsi-phy = <&sde_dsi_phy0 &sde_dsi_phy1>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -253,8 +253,8 @@
label = "dsi_adv_7533_1"; label = "dsi_adv_7533_1";
qcom,display-type = "secondary"; qcom,display-type = "secondary";
qcom,dsi-ctrl = <&mdss_dsi0>; qcom,dsi-ctrl = <&sde_dsi0>;
qcom,dsi-phy = <&mdss_dsi_phy0>; qcom,dsi-phy = <&sde_dsi_phy0>;
clocks = <&clock_mmss clk_ext_byte0_clk_src>, clocks = <&clock_mmss clk_ext_byte0_clk_src>,
<&clock_mmss clk_ext_pclk0_clk_src>; <&clock_mmss clk_ext_pclk0_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -269,8 +269,8 @@
label = "dsi_adv_7533_2"; label = "dsi_adv_7533_2";
qcom,display-type = "tertiary"; qcom,display-type = "tertiary";
qcom,dsi-ctrl = <&mdss_dsi1>; qcom,dsi-ctrl = <&sde_dsi1>;
qcom,dsi-phy = <&mdss_dsi_phy1>; qcom,dsi-phy = <&sde_dsi_phy1>;
clocks = <&clock_mmss clk_ext_byte1_clk_src>, clocks = <&clock_mmss clk_ext_byte1_clk_src>,
<&clock_mmss clk_ext_pclk1_clk_src>; <&clock_mmss clk_ext_pclk1_clk_src>;
clock-names = "src_byte_clk", "src_pixel_clk"; clock-names = "src_byte_clk", "src_pixel_clk";
@ -297,8 +297,8 @@
}; };
}; };
&mdss_mdp { &sde_kms {
connectors = <&mdss_hdmi &sde_hdmi &dsi_adv_7533_1 &dsi_adv_7533_2>; connectors = <&sde_hdmi_tx &sde_hdmi &dsi_adv_7533_1 &dsi_adv_7533_2>;
}; };
&dsi_dual_sharp_video { &dsi_dual_sharp_video {

39
arch/arm/boot/dts/qcom/msm8996-sde.dtsi
View file

@ -11,7 +11,7 @@
*/ */
&soc { &soc {
mdss_mdp: qcom,mdss_mdp@900000 { sde_kms: qcom,sde_kms@900000 {
compatible = "qcom,sde-kms"; compatible = "qcom,sde-kms";
reg = <0x00900000 0x90000>, reg = <0x00900000 0x90000>,
<0x009b0000 0x1040>, <0x009b0000 0x1040>,
@ -180,8 +180,8 @@
}; };
}; };
smmu_mdp_unsec: qcom,smmu_mdp_unsec_cb { smmu_kms_unsec: qcom,smmu_kms_unsec_cb {
compatible = "qcom,smmu_mdp_unsec"; compatible = "qcom,smmu_kms_unsec";
iommus = <&mdp_smmu 0>; iommus = <&mdp_smmu 0>;
}; };
@ -211,7 +211,7 @@
}; };
}; };
mdss_dsi0: qcom,mdss_dsi_ctrl0@994000 { sde_dsi0: qcom,sde_dsi_ctrl0@994000 {
compatible = "qcom,dsi-ctrl-hw-v1.4"; compatible = "qcom,dsi-ctrl-hw-v1.4";
label = "dsi-ctrl-0"; label = "dsi-ctrl-0";
cell-index = <0>; cell-index = <0>;
@ -246,7 +246,7 @@
<22 512 0 0>, <22 512 0 0>,
<22 512 0 1000>; <22 512 0 1000>;
interrupt-parent = <&mdss_mdp>; interrupt-parent = <&sde_kms>;
interrupts = <4 0>; interrupts = <4 0>;
qcom,core-supply-entries { qcom,core-supply-entries {
#address-cells = <1>; #address-cells = <1>;
@ -287,7 +287,7 @@
}; };
}; };
mdss_dsi1: qcom,mdss_dsi_ctrl1@996000 { sde_dsi1: qcom,sde_dsi_ctrl1@996000 {
compatible = "qcom,dsi-ctrl-hw-v1.4"; compatible = "qcom,dsi-ctrl-hw-v1.4";
label = "dsi-ctrl-1"; label = "dsi-ctrl-1";
cell-index = <1>; cell-index = <1>;
@ -321,7 +321,7 @@
<22 512 0 0>, <22 512 0 0>,
<22 512 0 1000>; <22 512 0 1000>;
interrupt-parent = <&mdss_mdp>; interrupt-parent = <&sde_kms>;
interrupts = <5 0>; interrupts = <5 0>;
qcom,core-supply-entries { qcom,core-supply-entries {
#address-cells = <1>; #address-cells = <1>;
@ -361,7 +361,7 @@
}; };
}; };
mdss_dsi_phy0: qcom,mdss_dsi_phy0@994400 { sde_dsi_phy0: qcom,sde_dsi_phy0@994400 {
compatible = "qcom,dsi-phy-v4.0"; compatible = "qcom,dsi-phy-v4.0";
label = "dsi-phy-0"; label = "dsi-phy-0";
cell-index = <0>; cell-index = <0>;
@ -420,7 +420,7 @@
}; };
}; };
mdss_dsi_phy1: qcom,mdss_dsi_phy1@996400 { sde_dsi_phy1: qcom,sde_dsi_phy1@996400 {
compatible = "qcom,dsi-phy-v4.0"; compatible = "qcom,dsi-phy-v4.0";
label = "dsi-phy-1"; label = "dsi-phy-1";
cell-index = <1>; cell-index = <1>;
@ -479,7 +479,7 @@
}; };
}; };
mdss_hdmi: qcom,hdmi_tx@9a0000 { sde_hdmi_tx: qcom,hdmi_tx_8996@9a0000 {
compatible = "qcom,hdmi-tx-8996"; compatible = "qcom,hdmi-tx-8996";
reg = <0x009a0000 0x50c>, reg = <0x009a0000 0x50c>,
@ -499,7 +499,7 @@
"core_clk", "core_clk",
"alt_iface_clk", "alt_iface_clk",
"extp_clk"; "extp_clk";
interrupt-parent = <&mdss_mdp>; interrupt-parent = <&sde_kms>;
interrupts = <8 0>; interrupts = <8 0>;
hpd-gdsc-supply = <&gdsc_mdss>; hpd-gdsc-supply = <&gdsc_mdss>;
qcom,hdmi-tx-hpd-gpio = <&pm8994_mpps 4 0>; qcom,hdmi-tx-hpd-gpio = <&pm8994_mpps 4 0>;
@ -511,23 +511,8 @@
&mdss_hdmi_ddc_suspend &mdss_hdmi_ddc_suspend
&mdss_hdmi_cec_suspend>; &mdss_hdmi_cec_suspend>;
hdmi_audio: qcom,msm-hdmi-audio-rx { sde_hdmi_audio: qcom,sde-hdmi-audio-rx {
compatible = "qcom,msm-hdmi-audio-codec-rx"; compatible = "qcom,msm-hdmi-audio-codec-rx";
}; };
}; };
}; };
/* dummy nodes for compatibility with 8996 mdss dtsi */
&soc {
mdss_dsi: qcom,mdss_dsi_dummy {
/* dummy node for backward compatibility */
};
mdss_hdmi_tx: qcom,mdss_hdmi_tx_dummy {
/* dummy node for backward compatibility */
};
mdss_fb2: qcom,mdss_fb2_dummy {
/* dummy node for backward compatibility */
};
};

4
arch/arm/boot/dts/qcom/msm8996-v2.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -480,7 +480,7 @@
gdsc-venus-supply = <&gdsc_venus>; gdsc-venus-supply = <&gdsc_venus>;
}; };
&mdss_hdmi { &sde_hdmi_tx {
hpd-gdsc-venus-supply = <&gdsc_venus>; hpd-gdsc-venus-supply = <&gdsc_venus>;
}; };

1
arch/arm/boot/dts/qcom/msm8996.dtsi
View file

@ -242,6 +242,7 @@
#include "msm8996-ion.dtsi" #include "msm8996-ion.dtsi"
#include "msm8996-sde.dtsi" #include "msm8996-sde.dtsi"
#include "msm8996-mdss.dtsi"
#include "msm8996-mdss-pll.dtsi" #include "msm8996-mdss-pll.dtsi"
#include "msm8996-smp2p.dtsi" #include "msm8996-smp2p.dtsi"
#include "msm8996-ipcrouter.dtsi" #include "msm8996-ipcrouter.dtsi"