A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3f10f8fe5f on remote branch

Browse source 
Change-Id: I91322399045a279563940f21e3a03523a2152bd3
This commit is contained in:
Linux Build Service Account 2022-02-14 21:58:46 -08:00
commit 8fcb65ac61
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
asoc/msm-lsm-client.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* 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/err.h>
@ -3092,14 +3093,6 @@ static int msm_lsm_close(struct snd_pcm_substream *substream)
__func__, ret);
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)) {
@ -3120,6 +3113,15 @@ static int msm_lsm_close(struct snd_pcm_substream *substream)
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
* to free SM and CAL buffer, even if

6
asoc/msm-pcm-routing-v2.c
View file

@ -26487,6 +26487,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = {
MSM_BACKEND_DAI_USB_TX,
MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_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[] = {
@ -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_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_1", "PRI_TDM_TX_1"},
{"MultiMedia20 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},

3
dsp/q6voice.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* 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/kthread.h>
@ -25,7 +26,7 @@
#include <dsp/voice_mhi.h>
#include <soc/qcom/secure_buffer.h>
#define TIMEOUT_MS 300
#define TIMEOUT_MS 1000
#define CMD_STATUS_SUCCESS 0

3
include/dsp/rtac.h Normal file → Executable file
View file

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* 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__
@ -13,7 +14,7 @@
#define RTAC_CVS 1
#define RTAC_VOICE_MODES 2
#define RTAC_MAX_ACTIVE_DEVICES 6
#define RTAC_MAX_ACTIVE_DEVICES 15
#define RTAC_MAX_ACTIVE_POPP 8
#define DEFAULT_APP_TYPE 0x00011130