Unverified Commit e89f45ed authored by Venkata Prasad Potturu's avatar Venkata Prasad Potturu Committed by Mark Brown
Browse files

ASoC: amd: vangogh: Add check for acp config flags in vangogh platform 



We have SOF and generic ACP support enabled for Vangogh platform
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 Vangogh based machines. If no flag is
specified probe and register older platform device.

Signed-off-by: default avatarVenkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://lore.kernel.org/r/20230530110802.674939-1-venkataprasad.potturu@amd.com


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

sound/soc/amd/vangogh/acp5x.h

+2 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ static inline void acp_writel(u32 val, void __iomem *base_addr) 
	writel(val, base_addr - ACP5x_PHY_BASE_ADDRESS);

}



int snd_amd_acp_find_config(struct pci_dev *pci);



static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd,

				     int direction)

{

sound/soc/amd/vangogh/pci-acp5x.c

+6 −1
Original line number Diff line number Diff line
@@ -125,10 +125,15 @@ static int snd_acp5x_probe(struct pci_dev *pci, 
{

	struct acp5x_dev_data *adata;

	struct platform_device_info pdevinfo[ACP5x_DEVS];

	unsigned int irqflags;

	unsigned int irqflags, flag;

	int ret, i;

	u32 addr, val;



	/* Return if acp config flag is defined */

	flag = snd_amd_acp_find_config(pci);

	if (flag)

		return -ENODEV;



	irqflags = IRQF_SHARED;

	if (pci->revision != 0x50)

		return -ENODEV;