Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f114ce60 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinvi-mcasp: Proper suspend/resume support while audio is active 



If the board is sent to suspend (deep sleep) the McASP context will be lost.
In case when suspend happens during active audio we need to save and restore
more registers, which was configured during hw_param times as well.
We need to add more config registers, AFIFO control registers and we also
need to save and restore the serializer configuration as well.
Since the number of serializers depends on the SoC we need to allocate the
memory for it based on the num_serializer for the given McASP instance.

With this patch the ongoing stream will resume after resuming from deep
sleep.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1cc0c054

sound/soc/davinci/davinci-mcasp.c

+41 −0
Original line number Original line Diff line number Diff line
@@ -49,11 +49,19 @@ static u32 context_regs[] = { 
	DAVINCI_MCASP_RXFMT_REG,

	DAVINCI_MCASP_RXFMT_REG,

	DAVINCI_MCASP_ACLKXCTL_REG,

	DAVINCI_MCASP_ACLKXCTL_REG,

	DAVINCI_MCASP_ACLKRCTL_REG,

	DAVINCI_MCASP_ACLKRCTL_REG,

	DAVINCI_MCASP_AHCLKXCTL_REG,

	DAVINCI_MCASP_AHCLKRCTL_REG,

	DAVINCI_MCASP_PDIR_REG,

	DAVINCI_MCASP_PDIR_REG,

	DAVINCI_MCASP_RXMASK_REG,

	DAVINCI_MCASP_TXMASK_REG,

	DAVINCI_MCASP_RXTDM_REG,

	DAVINCI_MCASP_TXTDM_REG,

};

};





struct davinci_mcasp_context {

struct davinci_mcasp_context {

	u32	config_regs[ARRAY_SIZE(context_regs)];

	u32	config_regs[ARRAY_SIZE(context_regs)];

	u32	afifo_regs[2]; /* for read/write fifo control registers */

	u32	*xrsr_regs; /* for serializer configuration */

};

};





struct davinci_mcasp {

struct davinci_mcasp {
@@ -861,11 +869,25 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai) 
{

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);

	struct davinci_mcasp_context *context = &mcasp->context;

	struct davinci_mcasp_context *context = &mcasp->context;

	u32 reg;

	int i;

	int i;





	for (i = 0; i < ARRAY_SIZE(context_regs); i++)

	for (i = 0; i < ARRAY_SIZE(context_regs); i++)

		context->config_regs[i] = mcasp_get_reg(mcasp, context_regs[i]);

		context->config_regs[i] = mcasp_get_reg(mcasp, context_regs[i]);





	if (mcasp->txnumevt) {

		reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;

		context->afifo_regs[0] = mcasp_get_reg(mcasp, reg);

	}

	if (mcasp->rxnumevt) {

		reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;

		context->afifo_regs[1] = mcasp_get_reg(mcasp, reg);

	}



	for (i = 0; i < mcasp->num_serializer; i++)

		context->xrsr_regs[i] = mcasp_get_reg(mcasp,

						DAVINCI_MCASP_XRSRCTL_REG(i));



	return 0;

	return 0;

}

}
@@ -873,11 +895,25 @@ static int davinci_mcasp_resume(struct snd_soc_dai *dai) 
{

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);

	struct davinci_mcasp_context *context = &mcasp->context;

	struct davinci_mcasp_context *context = &mcasp->context;

	u32 reg;

	int i;

	int i;





	for (i = 0; i < ARRAY_SIZE(context_regs); i++)

	for (i = 0; i < ARRAY_SIZE(context_regs); i++)

		mcasp_set_reg(mcasp, context_regs[i], context->config_regs[i]);

		mcasp_set_reg(mcasp, context_regs[i], context->config_regs[i]);





	if (mcasp->txnumevt) {

		reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;

		mcasp_set_reg(mcasp, reg, context->afifo_regs[0]);

	}

	if (mcasp->rxnumevt) {

		reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;

		mcasp_set_reg(mcasp, reg, context->afifo_regs[1]);

	}



	for (i = 0; i < mcasp->num_serializer; i++)

		mcasp_set_reg(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i),

			      context->xrsr_regs[i]);



	return 0;

	return 0;

}

}

#else

#else
@@ -1195,6 +1231,11 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
	mcasp->op_mode = pdata->op_mode;

	mcasp->op_mode = pdata->op_mode;

	mcasp->tdm_slots = pdata->tdm_slots;

	mcasp->tdm_slots = pdata->tdm_slots;

	mcasp->num_serializer = pdata->num_serializer;

	mcasp->num_serializer = pdata->num_serializer;

#ifdef CONFIG_PM_SLEEP

	mcasp->context.xrsr_regs = devm_kzalloc(&pdev->dev,

					sizeof(u32) * mcasp->num_serializer,

					GFP_KERNEL);

#endif

	mcasp->serial_dir = pdata->serial_dir;

	mcasp->serial_dir = pdata->serial_dir;

	mcasp->version = pdata->version;

	mcasp->version = pdata->version;

	mcasp->txnumevt = pdata->txnumevt;

	mcasp->txnumevt = pdata->txnumevt;