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

Commit 44e35236 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: dts: qcs405: enable cpu,platform and codec dai"

parents 2bd1e64d 5162ee66

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, 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
@@ -79,6 +79,11 @@ 
		qcom,msm-dai-q6-dev-id = <8>;

	};



	dai_hdmi_ms: qcom,msm-dai-q6-hdmi_ms {

		compatible = "qcom,msm-dai-q6-hdmi";

		qcom,msm-dai-q6-dev-id = <24578>;

	};



	dai_dp: qcom,msm-dai-q6-dp {

		compatible = "qcom,msm-dai-q6-hdmi";

		qcom,msm-dai-q6-dev-id = <24608>;

arch/arm64/boot/dts/qcom/qcs405-audio.dtsi

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -87,7 +87,8 @@ 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq", "msm-transcode-loopback";

		asoc-cpu = <&dai_dp>, <&dai_mi2s0>, <&dai_mi2s1>,

		asoc-cpu = <&dai_hdmi_ms>, <&dai_dp>,

			<&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s4>, <&dai_mi2s5>,

			<&dai_meta_mi2s0>, <&dai_meta_mi2s1>,

			<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
@@ -115,7 +116,8 @@ 
			<&dai_pri_spdif_rx>, <&dai_pri_spdif_tx>,

			<&dai_sec_spdif_rx>, <&dai_sec_spdif_tx>,

			<&sb_9_tx>, <&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-dp.24608",

		asoc-cpu-names = "msm-dai-q6-hdmi.24578",

			"msm-dai-q6-dp.24608",

			"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

			"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

			"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

arch/arm64/boot/dts/qcom/qcs405-csra8plus2-audio-overlay.dtsi

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, 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
@@ -111,6 +111,10 @@ 
	tcsr_i2s_dsd_quat = <0x195A000>;

	asoc-codec = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	qcom,ext-disp-audio-rx = <1>;

	asoc-codec = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

		"msm-ext-disp-audio-codec-rx";

	qcom,csra-max-devs = <8>;

	qcom,csra-devs = <&csra66x0_ampl_6B>, <&csra66x0_ampl_6A>,

		<&csra66x0_ampl_69>, <&csra66x0_ampl_68>,