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

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

ASoC: davinci-mcasp: Move pm callbacks from platform device to soc_dai_driver 



Handle the PM callbacks via the ASoC core instead of device core.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 0f7d9a63

sound/soc/davinci/davinci-mcasp.c

+37 −37
Original line number Diff line number Diff line
@@ -741,6 +741,41 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { 
	.set_sysclk	= davinci_mcasp_set_sysclk,

};



#ifdef CONFIG_PM_SLEEP

static int davinci_mcasp_suspend(struct snd_soc_dai *dai)

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);



	mcasp->context.txfmtctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_TXFMCTL_REG);

	mcasp->context.rxfmtctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_RXFMCTL_REG);

	mcasp->context.txfmt = mcasp_get_reg(mcasp, DAVINCI_MCASP_TXFMT_REG);

	mcasp->context.rxfmt = mcasp_get_reg(mcasp, DAVINCI_MCASP_RXFMT_REG);

	mcasp->context.aclkxctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_ACLKXCTL_REG);

	mcasp->context.aclkrctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_ACLKRCTL_REG);

	mcasp->context.pdir = mcasp_get_reg(mcasp, DAVINCI_MCASP_PDIR_REG);



	return 0;

}



static int davinci_mcasp_resume(struct snd_soc_dai *dai)

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);



	mcasp_set_reg(mcasp, DAVINCI_MCASP_TXFMCTL_REG, mcasp->context.txfmtctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_RXFMCTL_REG, mcasp->context.rxfmtctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_TXFMT_REG, mcasp->context.txfmt);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_RXFMT_REG, mcasp->context.rxfmt);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, mcasp->context.aclkxctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, mcasp->context.aclkrctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_PDIR_REG, mcasp->context.pdir);



	return 0;

}

#else

#define davinci_mcasp_suspend NULL

#define davinci_mcasp_resume NULL

#endif



#define DAVINCI_MCASP_RATES	SNDRV_PCM_RATE_8000_192000



#define DAVINCI_MCASP_PCM_FMTS (SNDRV_PCM_FMTBIT_S8 | \
@@ -757,6 +792,8 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { 
static struct snd_soc_dai_driver davinci_mcasp_dai[] = {

	{

		.name		= "davinci-mcasp.0",

		.suspend	= davinci_mcasp_suspend,

		.resume		= davinci_mcasp_resume,

		.playback	= {

			.channels_min	= 2,

			.channels_max	= 32 * 16,
@@ -1149,49 +1186,12 @@ static int davinci_mcasp_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int davinci_mcasp_suspend(struct device *dev)

{

	struct davinci_mcasp *mcasp = dev_get_drvdata(dev);



	mcasp->context.txfmtctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_TXFMCTL_REG);

	mcasp->context.rxfmtctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_RXFMCTL_REG);

	mcasp->context.txfmt = mcasp_get_reg(mcasp, DAVINCI_MCASP_TXFMT_REG);

	mcasp->context.rxfmt = mcasp_get_reg(mcasp, DAVINCI_MCASP_RXFMT_REG);

	mcasp->context.aclkxctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_ACLKXCTL_REG);

	mcasp->context.aclkrctl = mcasp_get_reg(mcasp, DAVINCI_MCASP_ACLKRCTL_REG);

	mcasp->context.pdir = mcasp_get_reg(mcasp, DAVINCI_MCASP_PDIR_REG);



	return 0;

}



static int davinci_mcasp_resume(struct device *dev)

{

	struct davinci_mcasp *mcasp = dev_get_drvdata(dev);



	mcasp_set_reg(mcasp, DAVINCI_MCASP_TXFMCTL_REG, mcasp->context.txfmtctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_RXFMCTL_REG, mcasp->context.rxfmtctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_TXFMT_REG, mcasp->context.txfmt);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_RXFMT_REG, mcasp->context.rxfmt);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, mcasp->context.aclkxctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, mcasp->context.aclkrctl);

	mcasp_set_reg(mcasp, DAVINCI_MCASP_PDIR_REG, mcasp->context.pdir);



	return 0;

}

#endif



SIMPLE_DEV_PM_OPS(davinci_mcasp_pm_ops,

		  davinci_mcasp_suspend,

		  davinci_mcasp_resume);



static struct platform_driver davinci_mcasp_driver = {

	.probe		= davinci_mcasp_probe,

	.remove		= davinci_mcasp_remove,

	.driver		= {

		.name	= "davinci-mcasp",

		.owner	= THIS_MODULE,

		.pm	= &davinci_mcasp_pm_ops,

		.of_match_table = mcasp_dt_ids,

	},

};