Unverified Commit 9eb48aed authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: SOF: amd: remove acp_dai_probe() function 



ACP SOF driver supports different audio configurations.
Explicit condition check for I2S configuration will break
other audio endpoint configurations.

acp_dai_probe() function is not required as we have
machine select logic to select the exact machine.

Remove acp_dai_probe() from existing AMD PCI driver code base.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20230403071651.919027-2-Vijendar.Mukunda@amd.com


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

sound/soc/sof/amd/acp-common.c

+0 −16
Original line number Diff line number Diff line
@@ -18,22 +18,6 @@ 
#include "acp-dsp-offset.h"

#include <sound/sof/xtensa.h>



int acp_dai_probe(struct snd_soc_dai *dai)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component);

	const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata);

	unsigned int val;



	val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->i2s_pin_config_offset);

	if (val != desc->i2s_mode) {

		dev_err(sdev->dev, "I2S Mode is not supported (I2S_PIN_CONFIG: %#x)\n", val);

		return -EINVAL;

	}



	return 0;

}

EXPORT_SYMBOL_NS(acp_dai_probe, SND_SOC_SOF_AMD_COMMON);



/**

 * amd_sof_ipc_dump() - This function is called when IPC tx times out.

 * @sdev: SOF device.

sound/soc/sof/amd/acp.h

+0 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ int sof_renoir_ops_init(struct snd_sof_dev *sdev); 
extern struct snd_sof_dsp_ops sof_rembrandt_ops;

int sof_rembrandt_ops_init(struct snd_sof_dev *sdev);



int acp_dai_probe(struct snd_soc_dai *dai);

struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev);

/* Machine configuration */

int snd_amd_acp_find_config(struct pci_dev *pci);

sound/soc/sof/amd/rembrandt.c

+0 −4
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ static struct snd_soc_dai_driver rembrandt_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &acp_dai_probe,

	},



	[I2S_BT_INSTANCE] = {
@@ -73,7 +72,6 @@ static struct snd_soc_dai_driver rembrandt_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &acp_dai_probe,

	},



	[I2S_SP_INSTANCE] = {
@@ -98,7 +96,6 @@ static struct snd_soc_dai_driver rembrandt_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &acp_dai_probe,

	},



	[PDM_DMIC_INSTANCE] = {
@@ -126,7 +123,6 @@ static struct snd_soc_dai_driver rembrandt_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 96000,

		},

		.probe = &acp_dai_probe,

	},

};

sound/soc/sof/amd/renoir.c

+0 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static struct snd_soc_dai_driver renoir_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &acp_dai_probe,

	},



	[I2S_SP_INSTANCE] = {
@@ -72,7 +71,6 @@ static struct snd_soc_dai_driver renoir_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &acp_dai_probe,

	},



	[PDM_DMIC_INSTANCE] = {
@@ -100,7 +98,6 @@ static struct snd_soc_dai_driver renoir_sof_dai[] = { 
			.rate_min = 8000,

			.rate_max = 96000,

		},

		.probe = &acp_dai_probe,

	},

};