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

Merge "asoc: wsa883x: Add dapm ignore suspend for DAIs"

Browse Source
This commit is contained in:
qctecmdr
2020-07-24 00:05:32 -07:00
committed by Gerrit - the friendly Code Review server
parent ae75f2e737 fc37483e72
commit 058ea89695
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
asoc/codecs/wsa883x/wsa883x.c
View File

@@ -1224,9 +1224,14 @@ static int wsa883x_codec_probe(struct snd_soc_component *component)
int variant = 0, version = 0; int variant = 0, version = 0;
struct snd_soc_dapm_context *dapm = struct snd_soc_dapm_context *dapm =
snd_soc_component_get_dapm(component); snd_soc_component_get_dapm(component);
char w_name[100];
if (!wsa883x) if (!wsa883x)
return -EINVAL; return -EINVAL;
if (!component->name_prefix)
return -EINVAL;
snd_soc_component_init_regmap(component, wsa883x->regmap); snd_soc_component_init_regmap(component, wsa883x->regmap);
dev = wsa883x->swr_slave; dev = wsa883x->swr_slave;
@@ -1245,6 +1250,22 @@ static int wsa883x_codec_probe(struct snd_soc_component *component)
snd_soc_dapm_ignore_suspend(dapm, snd_soc_dapm_ignore_suspend(dapm,
wsa883x->dai_driver->playback.stream_name); wsa883x->dai_driver->playback.stream_name);
memset(w_name, 0, 100);
strlcpy(w_name, component->name_prefix, 100);
strlcat(w_name, " IN", 100);
snd_soc_dapm_ignore_suspend(dapm, w_name);
memset(w_name, 0, 100);
strlcpy(w_name, component->name_prefix, 100);
strlcat(w_name, " SWR DAC_PORT", 100);
snd_soc_dapm_ignore_suspend(dapm, w_name);
memset(w_name, 0, 100);
strlcpy(w_name, component->name_prefix, 100);
strlcat(w_name, " SPKR", 100);
snd_soc_dapm_ignore_suspend(dapm, w_name);
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
return 0; return 0;