Merge 3f10f8fe5fbea2671efd3ac445f2ac99a4932ab1 on remote branch (8fcb65ac) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/msm-lsm-client.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
			* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*/		*/
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/err.h>		#include <linux/err.h>
	@@ -3092,14 +3093,6 @@ static int msm_lsm_close(struct snd_pcm_substream *substream)
	__func__, ret);		__func__, ret);
	prtd->lsm_client->lab_started = false;		prtd->lsm_client->lab_started = false;
	}		}
	if (prtd->lsm_client->lab_buffer) {
	ret = msm_lsm_lab_buffer_alloc(prtd,
	LAB_BUFFER_DEALLOC);
	if (ret)
	dev_err(rtd->dev,
	"%s: lab buffer dealloc failed ret %d\n",
	__func__, ret);
	}
	}		}

	if (!atomic_read(&prtd->read_abort)) {		if (!atomic_read(&prtd->read_abort)) {
	@@ -3120,6 +3113,15 @@ static int msm_lsm_close(struct snd_pcm_substream *substream)
	prtd->lsm_client->started = false;		prtd->lsm_client->started = false;
	}		}

			if (prtd->lsm_client->lab_enable && prtd->lsm_client->lab_buffer) {
			ret = msm_lsm_lab_buffer_alloc(prtd,
			LAB_BUFFER_DEALLOC);
			if (ret)
			dev_err(rtd->dev,
			"%s: lab buffer dealloc failed ret %d\n",
			__func__, ret);
			}

	/*		/*
	* De-register existing sound models		* De-register existing sound models
	* to free SM and CAL buffer, even if		* to free SM and CAL buffer, even if

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26487,6 +26487,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {
	MSM_BACKEND_DAI_USB_TX,		MSM_BACKEND_DAI_USB_TX,
	MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,		MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
	msm_routing_put_audio_mixer),		msm_routing_put_audio_mixer),
			SOC_DOUBLE_EXT("TERT_TDM_TX_0", SND_SOC_NOPM,
			MSM_BACKEND_DAI_TERT_TDM_TX_0,
			MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
			msm_routing_put_audio_mixer),
	};		};

	static const struct snd_kcontrol_new mmul18_mixer_controls[] = {		static const struct snd_kcontrol_new mmul18_mixer_controls[] = {
	@@ -38392,6 +38396,8 @@ static const struct snd_soc_dapm_route intercon_tdm[] = {
	{"MultiMedia10 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},		{"MultiMedia10 Mixer", "QUAT_TDM_TX_2", "QUAT_TDM_TX_2"},
	{"MultiMedia10 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},		{"MultiMedia10 Mixer", "QUAT_TDM_TX_3", "QUAT_TDM_TX_3"},

			{"MultiMedia17 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},

	{"MultiMedia20 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},		{"MultiMedia20 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
	{"MultiMedia20 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},		{"MultiMedia20 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
	{"MultiMedia20 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},		{"MultiMedia20 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},

+2 −1

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
			* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*/		*/
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/kthread.h>		#include <linux/kthread.h>
	@@ -25,7 +26,7 @@
	#include <dsp/voice_mhi.h>		#include <dsp/voice_mhi.h>
	#include <soc/qcom/secure_buffer.h>		#include <soc/qcom/secure_buffer.h>

	#define TIMEOUT_MS 300		#define TIMEOUT_MS 1000


	#define CMD_STATUS_SUCCESS 0		#define CMD_STATUS_SUCCESS 0

100644 → 100755

+2 −1

Original line number	Original line	Diff line number	Diff line
	/* SPDX-License-Identifier: GPL-2.0-only */		/* SPDX-License-Identifier: GPL-2.0-only */
	/*		/*
	* Copyright (c) 2011, 2013-2015, 2017-2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2011, 2013-2015, 2017-2019, The Linux Foundation. All rights reserved.
			* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
	*/		*/

	#ifndef __RTAC_H__		#ifndef __RTAC_H__
	@@ -13,7 +14,7 @@
	#define RTAC_CVS 1		#define RTAC_CVS 1
	#define RTAC_VOICE_MODES 2		#define RTAC_VOICE_MODES 2

	#define RTAC_MAX_ACTIVE_DEVICES 6		#define RTAC_MAX_ACTIVE_DEVICES 15
	#define RTAC_MAX_ACTIVE_POPP 8		#define RTAC_MAX_ACTIVE_POPP 8

	#define DEFAULT_APP_TYPE 0x00011130		#define DEFAULT_APP_TYPE 0x00011130