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

Merge "asoc: kona: call wsa set channel map for wsa883x"

Browse Source
This commit is contained in:
qctecmdr
2020-03-25 09:38:23 -07:00
committed by Gerrit - the friendly Code Review server
parent 58563a41f2 5f5eef75e1
commit 2e48e6f40a
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
asoc/kona.c
View File

@@ -31,6 +31,7 @@
#include "asoc/wcd-mbhc-v2.h" #include "asoc/wcd-mbhc-v2.h"
#include "codecs/wcd938x/wcd938x-mbhc.h" #include "codecs/wcd938x/wcd938x-mbhc.h"
#include "codecs/wsa881x.h" #include "codecs/wsa881x.h"
#include "codecs/wsa883x/wsa883x.h"
#include "codecs/wcd938x/wcd938x.h" #include "codecs/wcd938x/wcd938x.h"
#include "codecs/bolero/bolero-cdc.h" #include "codecs/bolero/bolero-cdc.h"
#include <dt-bindings/sound/audio-codec-port-types.h> #include <dt-bindings/sound/audio-codec-port-types.h>
@@ -7165,6 +7166,11 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
if (!strcmp(component->name_prefix, "SpkrLeft")) { if (!strcmp(component->name_prefix, "SpkrLeft")) {
dev_dbg(component->dev, "%s: setting left ch map to codec %s\n", dev_dbg(component->dev, "%s: setting left ch map to codec %s\n",
__func__, component->name); __func__, component->name);
if (strnstr(component->name, "wsa883x", sizeof(component->name)))
wsa883x_set_channel_map(component, &spkleft_ports[0],
WSA881X_MAX_SWR_PORTS, &ch_mask[0],
&ch_rate[0], &spkleft_port_types[0]);
else
wsa881x_set_channel_map(component, &spkleft_ports[0], wsa881x_set_channel_map(component, &spkleft_ports[0],
WSA881X_MAX_SWR_PORTS, &ch_mask[0], WSA881X_MAX_SWR_PORTS, &ch_mask[0],
&ch_rate[0], &spkleft_port_types[0]); &ch_rate[0], &spkleft_port_types[0]);
@@ -7175,6 +7181,11 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
} else if (!strcmp(component->name_prefix, "SpkrRight")) { } else if (!strcmp(component->name_prefix, "SpkrRight")) {
dev_dbg(component->dev, "%s: setting right ch map to codec %s\n", dev_dbg(component->dev, "%s: setting right ch map to codec %s\n",
__func__, component->name); __func__, component->name);
if (strnstr(component->name, "wsa883x", sizeof(component->name)))
wsa883x_set_channel_map(component, &spkright_ports[0],
WSA881X_MAX_SWR_PORTS, &ch_mask[0],
&ch_rate[0], &spkright_port_types[0]);
else
wsa881x_set_channel_map(component, &spkright_ports[0], wsa881x_set_channel_map(component, &spkright_ports[0],
WSA881X_MAX_SWR_PORTS, &ch_mask[0], WSA881X_MAX_SWR_PORTS, &ch_mask[0],
&ch_rate[0], &spkright_port_types[0]); &ch_rate[0], &spkright_port_types[0]);
@@ -7200,6 +7211,10 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
} }
pdata->codec_root = entry; pdata->codec_root = entry;
} }
if (strnstr(component->name, "wsa883x", sizeof(component->name)))
wsa883x_codec_info_create_codec_entry(pdata->codec_root,
component);
else
wsa881x_codec_info_create_codec_entry(pdata->codec_root, wsa881x_codec_info_create_codec_entry(pdata->codec_root,
component); component);
err: err: