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

Venkata-Prasad-Potturu · broonie · commit e89f45edb747 · 2023-05-30T13:43:37.000+01:00
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: Venkata Prasad Potturu <venkataprasad.potturu@amd.com> Link: https://lore.kernel.org/r/20230530110802.674939-1-venkataprasad.potturu@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/amd/vangogh/acp5x.h b/sound/soc/amd/vangogh/acp5x.h
@@ -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)
 {
diff --git a/sound/soc/amd/vangogh/pci-acp5x.c b/sound/soc/amd/vangogh/pci-acp5x.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ static inline void acp_writel(u32 val, void __iomem *base_addr)`
`147`	`147`	`writel(val, base_addr - ACP5x_PHY_BASE_ADDRESS);`
`148`	`148`	`}`
`149`	`149`
	`150`	`+int snd_amd_acp_find_config(struct pci_dev *pci);`
	`151`	`+`
`150`	`152`	`static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd,`
`151`	`153`	`int direction)`
`152`	`154`	`{`