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

ASoC: SOF: amd: Add dai driver dsp ops callback for Renoir 



Add dsp ops callback to register I2S and DMIC sof dai's with ALSA

Signed-off-by: default avatarAjit Kumar Pandey <AjitKumar.Pandey@amd.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20211117093734.17407-6-daniel.baluta@oss.nxp.com


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

sound/soc/sof/amd/acp-dsp-offset.h

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#define ACPAXI2AXI_ATU_CTRL			0xC40

#define ACP_SOFT_RESET				0x1000



#define ACP_I2S_PIN_CONFIG			0x1400



/* Registers from ACP_PGFSM block */

#define ACP_PGFSM_CONTROL			0x141C

#define ACP_PGFSM_STATUS			0x1420

sound/soc/sof/amd/renoir.c

+91 −0
Original line number Diff line number Diff line
@@ -15,7 +15,94 @@ 
#include <linux/module.h>



#include "../ops.h"

#include "../sof-audio.h"

#include "acp.h"

#include "acp-dsp-offset.h"



#define I2S_BT_INSTANCE		0

#define I2S_SP_INSTANCE		1

#define PDM_DMIC_INSTANCE	2



#define I2S_MODE		0x04



static int renoir_dai_probe(struct snd_soc_dai *dai)

{

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

	unsigned int val;



	val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_I2S_PIN_CONFIG);

	if (val != I2S_MODE) {

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

		return -EINVAL;

	}



	return 0;

}



static struct snd_soc_dai_driver renoir_sof_dai[] = {

	[I2S_BT_INSTANCE] = {

		.id = I2S_BT_INSTANCE,

		.name = "acp-sof-bt",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			/* Supporting only stereo for I2S BT controller capture */

			.channels_min = 2,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &renoir_dai_probe,

	},



	[I2S_SP_INSTANCE] = {

		.id = I2S_SP_INSTANCE,

		.name = "acp-sof-sp",

		.playback = {

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 96000,

		},

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 |

				   SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S32_LE,

			/* Supporting only stereo for I2S SP controller capture */

			.channels_min = 2,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.probe = &renoir_dai_probe,

	},



	[PDM_DMIC_INSTANCE] = {

		.id = PDM_DMIC_INSTANCE,

		.name = "acp-sof-dmic",

		.capture = {

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 2,

			.channels_max = 4,

			.rate_min = 8000,

			.rate_max = 48000,

		},

	},

};



/* AMD Renoir DSP ops */

const struct snd_sof_dsp_ops sof_renoir_ops = {
@@ -49,6 +136,10 @@ const struct snd_sof_dsp_ops sof_renoir_ops = { 
	.get_mailbox_offset	= acp_sof_ipc_get_mailbox_offset,

	.irq_thread		= acp_sof_ipc_irq_thread,

	.fw_ready		= sof_fw_ready,



	/* DAI drivers */

	.drv			= renoir_sof_dai,

	.num_drv		= ARRAY_SIZE(renoir_sof_dai),

};

EXPORT_SYMBOL(sof_renoir_ops);