Unverified Commit 2d7d9f36 authored by Ajit Kumar Pandey's avatar Ajit Kumar Pandey Committed by Mark Brown
Browse files

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



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: default avatarAjit Kumar Pandey <AjitKumar.Pandey@amd.com>
Link: https://lore.kernel.org/r/20220117115854.455995-7-AjitKumar.Pandey@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 611ba05e

sound/soc/amd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/amd/renoir/rn-pci-acp3x.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/amd/renoir/rn_acp3x.h

+3 −0
Original line number Diff line number Diff line
@@ -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);