diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-06 04:39:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-06 04:38:59 -0700 |
| commit | e868dcc8bbe582a3ac9e859c8fd8db54f4e25813 (patch) | |
| tree | f8364cff8ecdf716a3d1f3edcd9f0a294c541f03 /arch | |
| parent | 338e7392a62dad30f996a65427059eec758bc531 (diff) | |
| parent | a027ef61cf1913dc7824fe9816c71b6bff6dc215 (diff) | |
Merge "ARM: dts: msm: add MSM external display node to msm8996"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-mdss.dtsi | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-mdss.dtsi b/arch/arm/boot/dts/qcom/msm8996-mdss.dtsi index 3186f96b4275..12fa68fac0fb 100644 --- a/arch/arm/boot/dts/qcom/msm8996-mdss.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-mdss.dtsi @@ -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 * it under the terms of the GNU General Public License version 2 and @@ -459,6 +459,15 @@ qcom,mdss_pan_bpp = <24>; }; + 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>; + }; + }; + mdss_hdmi_tx: qcom,hdmi_tx@9a0000 { cell-index = <0>; compatible = "qcom,hdmi-tx"; @@ -476,13 +485,14 @@ qcom,enable-load = <0>; qcom,disable-load = <0>; + qcom,msm_ext_disp = <&msm_ext_disp>; clocks = <&clock_mmss clk_mdss_mdp_vote_clk>, <&clock_mmss clk_mdss_ahb_clk>, <&clock_mmss clk_mdss_hdmi_clk>, <&clock_mmss clk_mdss_hdmi_ahb_clk>, <&clock_mmss clk_mdss_extpclk_clk>; - clock-names = "mdp_core_clk", "iface_clk", - "core_clk", "alt_iface_clk", "extp_clk"; + clock-names = "hpd_mdp_core_clk", "hpd_iface_clk", + "hpd_core_clk", "hpd_alt_iface_clk", "core_extp_clk"; qcom,hdmi-tx-hpd = <&pm8994_mpps 4 0>; qcom,mdss-fb-map = <&mdss_fb2>; |