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

asoc: codecs: Fix WSA dapm_ignore_suspend pin names

Browse Source 
Update to 5.15 kernel dapm api.
Pin name no longer needs prefix as it is added in API.

Change-Id: I5c1378839f4c4d2aa70fb11706c5bb65d4eb0952
Signed-off-by: Matthew Rice <quic_mrice@quicinc.com>
This commit is contained in:
Matthew Rice
2022-02-10 15:37:17 -08:00
parent 110af4933f
commit f3d67be087
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
asoc/codecs/wsa884x/wsa884x.c
View File

@@ -1607,25 +1607,20 @@ static int wsa884x_codec_probe(struct snd_soc_component *component)
wsa884x->global_pa_cnt = 0; wsa884x->global_pa_cnt = 0;
memset(w_name, 0, sizeof(w_name)); memset(w_name, 0, sizeof(w_name));
strlcpy(w_name, component->name_prefix, sizeof(w_name)); strlcpy(w_name, wsa884x->dai_driver->playback.stream_name,
strlcat(w_name, " ", sizeof(w_name));
strlcat(w_name, wsa884x->dai_driver->playback.stream_name,
sizeof(w_name)); sizeof(w_name));
snd_soc_dapm_ignore_suspend(dapm, w_name); snd_soc_dapm_ignore_suspend(dapm, w_name);
memset(w_name, 0, sizeof(w_name)); memset(w_name, 0, sizeof(w_name));
strlcpy(w_name, component->name_prefix, sizeof(w_name)); strlcpy(w_name, "IN", sizeof(w_name));
strlcat(w_name, " IN", sizeof(w_name));
snd_soc_dapm_ignore_suspend(dapm, w_name); snd_soc_dapm_ignore_suspend(dapm, w_name);
memset(w_name, 0, sizeof(w_name)); memset(w_name, 0, sizeof(w_name));
strlcpy(w_name, component->name_prefix, sizeof(w_name)); strlcpy(w_name, "SWR DAC_Port", sizeof(w_name));
strlcat(w_name, " SWR DAC_Port", sizeof(w_name));
snd_soc_dapm_ignore_suspend(dapm, w_name); snd_soc_dapm_ignore_suspend(dapm, w_name);
memset(w_name, 0, sizeof(w_name)); memset(w_name, 0, sizeof(w_name));
strlcpy(w_name, component->name_prefix, sizeof(w_name)); strlcpy(w_name, "SPKR", sizeof(w_name));
strlcat(w_name, " SPKR", sizeof(w_name));
snd_soc_dapm_ignore_suspend(dapm, w_name); snd_soc_dapm_ignore_suspend(dapm, w_name);
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
@@ -2103,7 +2098,7 @@ static int wsa884x_swr_probe(struct swr_device *pdev)
wsa884x->bat_cfg = snd_soc_component_read(component, wsa884x->bat_cfg = snd_soc_component_read(component,
WSA884X_VPHX_SYS_EN_STATUS); WSA884X_VPHX_SYS_EN_STATUS);
dev_dbg(component->dev, dev_dbg(component->dev,
"%s: Bat_cfg: 0x%x rload: 0x%x, sys_gain: 0x%x %x\n", __func__, "%s: Bat_cfg: 0x%x, Rload: 0x%x, Sys_gain: 0x%x\n", __func__,
wsa884x->bat_cfg, wsa884x->rload, wsa884x->system_gain); wsa884x->bat_cfg, wsa884x->rload, wsa884x->system_gain);
ret = wsa884x_validate_dt_configuration_params(wsa884x->rload, ret = wsa884x_validate_dt_configuration_params(wsa884x->rload,
wsa884x->bat_cfg, wsa884x->system_gain); wsa884x->bat_cfg, wsa884x->system_gain);