Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: amd: acp: add condition check for i2s clock generation

Browse source 
for only PDM endpoint i2s master clock is not required.
Add a condition check for the same based on chip flag value.

Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
Link: https://lore.kernel.org/r/20231021145110.478744-8-Syed.SabaKareem@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Syed Saba Kareem 2023-10-21 20:20:49 +05:30 committed by Mark Brown
parent 57e857770f
commit 16fb2a2544
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/amd/acp/acp-rembrandt.c
View file

@ -191,6 +191,7 @@ static int rembrandt_audio_probe(struct platform_device *pdev)
struct acp_chip_info *chip;
struct acp_dev_data *adata;
struct resource *res;
u32 ret;
chip = dev_get_platdata(&pdev->dev);
if (!chip || !chip->base) {
@ -234,7 +235,12 @@ static int rembrandt_audio_probe(struct platform_device *pdev)
acp_machine_select(adata);
dev_set_drvdata(dev, adata);
acp6x_master_clock_generate(dev);
if (chip->flag != FLAG_AMD_LEGACY_ONLY_DMIC) {
ret = acp6x_master_clock_generate(dev);
if (ret)
return ret;
}
acp_enable_interrupts(adata);
acp_platform_register(dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, ACP_SUSPEND_DELAY_MS);
@ -263,7 +269,9 @@ static int __maybe_unused rmb_pcm_resume(struct device *dev)
snd_pcm_uframes_t buf_in_frames;
u64 buf_size;
acp6x_master_clock_generate(dev);
if (adata->flag != FLAG_AMD_LEGACY_ONLY_DMIC)
acp6x_master_clock_generate(dev);
spin_lock(&adata->acp_lock);
list_for_each_entry(stream, &adata->stream_list, list) {
substream = stream->substream;

12
sound/soc/amd/acp/acp63.c
View file

@ -244,10 +244,12 @@ static int acp63_audio_probe(struct platform_device *pdev)
adata->machines = snd_soc_acpi_amd_acp63_acp_machines;
acp_machine_select(adata);
dev_set_drvdata(dev, adata);
ret = acp63_i2s_master_clock_generate(adata);
if (ret)
return ret;
if (chip->flag != FLAG_AMD_LEGACY_ONLY_DMIC) {
ret = acp63_i2s_master_clock_generate(adata);
if (ret)
return ret;
}
acp_enable_interrupts(adata);
acp_platform_register(dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, ACP_SUSPEND_DELAY_MS);
@ -276,7 +278,9 @@ static int __maybe_unused acp63_pcm_resume(struct device *dev)
snd_pcm_uframes_t buf_in_frames;
u64 buf_size;
acp63_i2s_master_clock_generate(adata);
if (adata->flag != FLAG_AMD_LEGACY_ONLY_DMIC)
acp63_i2s_master_clock_generate(adata);
spin_lock(&adata->acp_lock);
list_for_each_entry(stream, &adata->stream_list, list) {
if (stream) {