samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: lpass-cdc: Update digital codec driver name

Browse Source 
Update LPASS digital codec driver name for proper enumeration.

Change-Id: Ied6a3697a5e47c0695b6339ec7b4b4561ef6ccbd
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
This commit is contained in:
Sudheer Papothi
2021-01-13 04:22:40 +05:30
parent 16bae5f7c3
commit 78e6d7ec4b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asoc/codecs/lpass-cdc/lpass-cdc-wsa2-macro.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. /* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -406,7 +406,7 @@ static struct snd_soc_dai_ops lpass_cdc_wsa2_macro_dai_ops = {
static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[] = { static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[] = {
{ {
.name = "lpass_cdc_wsa2_macro_rx1", .name = "wsa2_macro_rx1",
.id = LPASS_CDC_WSA2_MACRO_AIF1_PB, .id = LPASS_CDC_WSA2_MACRO_AIF1_PB,
.playback = { .playback = {
.stream_name = "WSA2_AIF1 Playback", .stream_name = "WSA2_AIF1 Playback",
@@ -420,7 +420,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[] = {
.ops = &lpass_cdc_wsa2_macro_dai_ops, .ops = &lpass_cdc_wsa2_macro_dai_ops,
}, },
{ {
.name = "lpass_cdc_wsa2_macro_rx_mix", .name = "wsa2_macro_rx_mix",
.id = LPASS_CDC_WSA2_MACRO_AIF_MIX1_PB, .id = LPASS_CDC_WSA2_MACRO_AIF_MIX1_PB,
.playback = { .playback = {
.stream_name = "WSA2_AIF_MIX1 Playback", .stream_name = "WSA2_AIF_MIX1 Playback",
@@ -434,7 +434,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[] = {
.ops = &lpass_cdc_wsa2_macro_dai_ops, .ops = &lpass_cdc_wsa2_macro_dai_ops,
}, },
{ {
.name = "lpass_cdc_wsa2_macro_vifeedback", .name = "wsa2_macro_vifeedback",
.id = LPASS_CDC_WSA2_MACRO_AIF_VI, .id = LPASS_CDC_WSA2_MACRO_AIF_VI,
.capture = { .capture = {
.stream_name = "WSA2_AIF_VI Capture", .stream_name = "WSA2_AIF_VI Capture",
@@ -448,7 +448,7 @@ static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[] = {
.ops = &lpass_cdc_wsa2_macro_dai_ops, .ops = &lpass_cdc_wsa2_macro_dai_ops,
}, },
{ {
.name = "lpass_cdc_wsa2_macro_echo", .name = "wsa2_macro_echo",
.id = LPASS_CDC_WSA2_MACRO_AIF_ECHO, .id = LPASS_CDC_WSA2_MACRO_AIF_ECHO,
.capture = { .capture = {
.stream_name = "WSA2_AIF_ECHO Capture", .stream_name = "WSA2_AIF_ECHO Capture",

4
asoc/codecs/lpass-cdc/lpass-cdc.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. /* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/of_platform.h> #include <linux/of_platform.h>
@@ -19,7 +19,7 @@
#include "internal.h" #include "internal.h"
#include "lpass-cdc-clk-rsc.h" #include "lpass-cdc-clk-rsc.h"
#define DRV_NAME "lpass_cdc" #define DRV_NAME "lpass-cdc"
#define LPASS_CDC_VERSION_ENTRY_SIZE 32 #define LPASS_CDC_VERSION_ENTRY_SIZE 32
#define LPASS_CDC_STRING_LEN 80 #define LPASS_CDC_STRING_LEN 80

10
asoc/waipio.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/clk.h> #include <linux/clk.h>
@@ -987,8 +987,8 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)
&ch_rate[0], &spkleft_port_types[0]); &ch_rate[0], &spkleft_port_types[0]);
if (dapm->component) { if (dapm->component) {
snd_soc_dapm_ignore_suspend(dapm, "spkrLeft IN"); snd_soc_dapm_ignore_suspend(dapm, "spkrLeft IN");
snd_soc_dapm_ignore_suspend(dapm, "spkrLeft SPKR"); snd_soc_dapm_ignore_suspend(dapm, "spkrLeft SPKR");
} }
wsa883x_codec_info_create_codec_entry(pdata->codec_root, wsa883x_codec_info_create_codec_entry(pdata->codec_root,
@@ -1018,9 +1018,9 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)
component); component);
} }
component = snd_soc_rtdcom_lookup(rtd, "lpass_cdc_codec"); component = snd_soc_rtdcom_lookup(rtd, "lpass-cdc");
if (!component) { if (!component) {
pr_err("%s: could not find component for lpass_cdc_codec\n", pr_err("%s: could not find component for lpass-cdc\n",
__func__); __func__);
return ret; return ret;
} }