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

Commit c563e4e8 authored by Xiaojun Sang's avatar Xiaojun Sang
Browse files

ARM: dts: msm: Remove add sb_4_tx_vi to support VI recording at msm8998 



This reverts commit 9f45a559 ("ARM: dts: msm:
add sb_4_tx_vi to support VI recording at msm8998")

It is unnecessary to support concurrency of VI sense
recording and speaker protection.

CRs-Fixed: 1113625
Change-Id: I13ee9fd2daed2ad55347c112eeb79a9bfe6495ba
Signed-off-by: default avatarXiaojun Sang <xsang@codeaurora.org>
parent 409b6ad2

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

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

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

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

		};



		sb_4_tx_vi: qcom,msm-dai-q6-sb-4-tx-vi {

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

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

		};



		sb_5_tx: qcom,msm-dai-q6-sb-5-tx {

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

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

arch/arm/boot/dts/qcom/msm8998-audio.dtsi

+2 −6
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ 
				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,

				<&sb_5_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,
@@ -127,7 +126,6 @@ 
				"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.20233",

				"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",

				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",

				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
@@ -239,8 +237,7 @@ 
				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,

				 <&sb_5_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,
@@ -261,7 +258,6 @@ 
				"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.20233",

				"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",

				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",

				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",