Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: amd: renoir: Add check for acp configuration flags

Browse Source 
We have SOF and generic ACP support enabled for Renoir platforms
on some machines. Since we have same PCI id used for probing, add
check for machine configuration flag to avoid conflict with newer
pci drivers. Such machine flag has been initialized via dmi match
on few Chrome machines. If no flag is specified probe and register
older platform device.

Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
Link: https://lore.kernel.org/r/20220117115854.455995-7-AjitKumar.Pandey@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ajit Kumar Pandey 2022-01-17 17:28:54 +05:30 committed by Mark Brown
parent 611ba05e8b
commit 2d7d9f36b5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/amd/Kconfig
View File

@ -44,6 +44,7 @@ config SND_SOC_AMD_RV_RT5682_MACH
config SND_SOC_AMD_RENOIR
tristate "AMD Audio Coprocessor - Renoir support"
select SND_AMD_ACP_CONFIG
depends on X86 && PCI
help
This option enables ACP support for Renoir platform

7
sound/soc/amd/renoir/rn-pci-acp3x.c
View File

@ -212,10 +212,15 @@ static int snd_rn_acp_probe(struct pci_dev *pci,
acpi_integer dmic_status;
#endif
const struct dmi_system_id *dmi_id;
unsigned int irqflags;
unsigned int irqflags, flag;
int ret, index;
u32 addr;
/* Return if acp config flag is defined */
flag = snd_amd_acp_find_config(pci);
if (flag)
return -ENODEV;
/* Renoir device check */
if (pci->revision != 0x01)
return -ENODEV;

3
sound/soc/amd/renoir/rn_acp3x.h
View File

@ -88,3 +88,6 @@ static inline void rn_writel(u32 val, void __iomem *base_addr)
{
writel(val, base_addr - ACP_PHY_BASE_ADDRESS);
}
/* Machine configuration */
int snd_amd_acp_find_config(struct pci_dev *pci);