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

Commit 845a8313 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: support msm-pcm-dtmf on msm8996 adsp/cdp"

parents 45df31e9 b613e31b

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+7 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, 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
@@ -699,14 +699,14 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

				<&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

				"msm-pcm-loopback.1", "msm-pcm-dtmf";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -769,6 +769,10 @@ 
		qcom,msm-pcm-loopback-low-latency;

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

		compatible = "qcom,msm-pcm-dtmf";

	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

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

+4 −5
Original line number Diff line number Diff line
@@ -1054,14 +1054,14 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

				<&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

				"msm-pcm-loopback.1", "msm-pcm-dtmf";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -1157,9 +1157,8 @@ 
		qcom,msm-pcm-loopback-low-latency;

	};



	loopback1: qcom,msm-pcm-loopback-low-latency {

		compatible = "qcom,msm-pcm-loopback";

		qcom,msm-pcm-loopback-low-latency;

	pcm_dtmf: qcom,msm-pcm-dtmf {

		compatible = "qcom,msm-pcm-dtmf";

	};



	qcom,msm-dai-mi2s {

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

+6 −2
Original line number Diff line number Diff line
@@ -905,14 +905,14 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

				<&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

				"msm-pcm-loopback.1", "msm-pcm-dtmf";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -977,6 +977,10 @@ 
		qcom,msm-pcm-loopback-low-latency;

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

		compatible = "qcom,msm-pcm-dtmf";

	};



	usb_vbus_vreg: usb_vbus_vreg {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus_vreg";

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+7 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, 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
@@ -524,14 +524,14 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

				<&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

				"msm-pcm-loopback.1", "msm-pcm-dtmf";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -588,6 +588,10 @@ 
		qcom,msm-pcm-loopback-low-latency;

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

		compatible = "qcom,msm-pcm-dtmf";

	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

			<&loopback>, <&compress>, <&hostless>,

			<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

			<&loopback1>;

			<&loopback1>, <&pcm_dtmf>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

			"msm-pcm-dsp.2", "msm-voip-dsp",

			"msm-pcm-voice", "msm-pcm-loopback",

			"msm-compress-dsp", "msm-pcm-hostless",

			"msm-pcm-afe", "msm-lsm-client",

			"msm-pcm-routing", "msm-pcm-dsp-noirq",

			"msm-pcm-loopback.1";

			"msm-pcm-loopback.1", "msm-pcm-dtmf";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

			<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

			<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -119,6 +119,10 @@ 
		qcom,destroy-cvd;

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

		compatible = "qcom,msm-pcm-dtmf";

	};



	stub_codec: qcom,msm-stub-codec {

		compatible = "qcom,msm-stub-codec";

	};