Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e868dcc8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add MSM external display node to msm8996"

parents 338e7392 a027ef61
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
/* 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>;