summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunyun Cao <yunyunc@codeaurora.org>2017-03-23 20:39:40 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-11 12:12:57 -0700
commit7e91fe6bbd20da5ef9263649cefb7864cd0e3f8f (patch)
tree7fc97a2191974fc2b41336b21dc9e6f4c83b5d4d
parent4eb2141208cda6d1a39d27b3c9c64af826c11c6f (diff)
drm: msm: Add HDMI display on 8996 auto platform
Add sde hdmi node in device tree Change-Id: Ic5d73a05b6fc733c694724c72d38267fbaf5fcfc Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi18
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-sde.dtsi15
2 files changed, 17 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi
index f7490a34cb40..a94c972f532d 100644
--- a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi
@@ -267,10 +267,26 @@
vddio-supply = <&pm8994_l14>;
qcom,bridge-index = <0>;
};
+
+ msm_ext_disp: qcom,msm_ext_disp {
+ compatible = "qcom,msm-ext-disp";
+
+ ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {
+ compatible = "qcom,msm-ext-disp-audio-codec-rx";
+ qcom,msm_ext_disp = <&msm_ext_disp>;
+ };
+ };
+
+ sde_hdmi: qcom,hdmi-display {
+ compatible = "qcom,hdmi-display";
+ label = "sde_hdmi";
+ qcom,display-type = "secondary";
+ qcom,msm_ext_disp = <&msm_ext_disp>;
+ };
};
&mdss_mdp {
- connectors = <&dsi_adv_7533_1>;
+ connectors = <&dsi_adv_7533_1 &mdss_hdmi &sde_hdmi>;
};
&dsi_dual_sharp_video {
diff --git a/arch/arm/boot/dts/qcom/msm8996-sde.dtsi b/arch/arm/boot/dts/qcom/msm8996-sde.dtsi
index 8aebac3b0e22..a16e93f4adde 100644
--- a/arch/arm/boot/dts/qcom/msm8996-sde.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-sde.dtsi
@@ -183,21 +183,6 @@
iommus = <&mdp_smmu 0>;
};
- smmu_rot_unsec: qcom,smmu_rot_unsec_cb {
- compatible = "qcom,smmu_rot_unsec";
- iommus = <&rot_smmu 0>;
- };
-
- smmu_mdp_sec: qcom,smmu_mdp_sec_cb {
- compatible = "qcom,smmu_mdp_sec";
- iommus = <&mdp_smmu 1>;
- };
-
- smmu_rot_sec: qcom,smmu_rot_sec_cb {
- compatible = "qcom,smmu_rot_sec";
- iommus = <&rot_smmu 1>;
- };
-
/* data and reg bus scale settings */
qcom,sde-data-bus {
qcom,msm-bus,name = "mdss_sde";