openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: bcm: cygnus-ssp: move .suspend/.resume to component 

There is no big difference at implementation for .suspend/.resume
between DAI driver and Component driver.
But because some driver is using DAI version, thus ALSA SoC needs
to keep supporting it, hence, framework becoming verbose.
If we can switch all DAI driver .suspend/.resume to Component driver,
we can remove verbose code from ALSA SoC.

Driver is getting its private data via dai->dev.
But dai->dev and component->dev are same dev, thus, we can convert
these. For same reason, we can convert dai->active to
component->active if necessary.

This patch moves DAI driver .suspend/.resume to Component driver

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87blqzym4w.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-01-20 10:03:43 +09:00 committed by Mark Brown
parent 791a0059e2
commit 7307d33a28
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sound/soc/bcm/cygnus-ssp.c
View File

@ -1052,10 +1052,13 @@ static int cygnus_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int cygnus_ssp_suspend(struct snd_soc_dai *cpu_dai) static int __cygnus_ssp_suspend(struct snd_soc_dai *cpu_dai)
{ {
struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai); struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai);
if (!cpu_dai->active)
return 0;
if (!aio->is_slave) { if (!aio->is_slave) {
u32 val; u32 val;
@ -1078,11 +1081,25 @@ static int cygnus_ssp_suspend(struct snd_soc_dai *cpu_dai)
return 0; return 0;
} }
static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai) static int cygnus_ssp_suspend(struct snd_soc_component *component)
{
struct snd_soc_dai *dai;
int ret = 0;
for_each_component_dais(component, dai)
ret |= __cygnus_ssp_suspend(dai);
return ret;
}
static int __cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
{ {
struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai); struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai);
int error; int error;
if (!cpu_dai->active)
return 0;
if (!aio->is_slave) { if (!aio->is_slave) {
if (aio->clk_trace.cap_clk_en) { if (aio->clk_trace.cap_clk_en) {
error = clk_prepare_enable(aio->cygaud-> error = clk_prepare_enable(aio->cygaud->
@ -1109,6 +1126,18 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
return 0; return 0;
} }
static int cygnus_ssp_resume(struct snd_soc_component *component)
{
struct snd_soc_dai *dai;
int ret = 0;
for_each_component_dais(component, dai)
ret |= __cygnus_ssp_resume(dai);
return ret;
}
#else #else
#define cygnus_ssp_suspend NULL #define cygnus_ssp_suspend NULL
#define cygnus_ssp_resume NULL #define cygnus_ssp_resume NULL
@ -1149,8 +1178,6 @@ static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
SNDRV_PCM_FMTBIT_S32_LE, \ SNDRV_PCM_FMTBIT_S32_LE, \
}, \ }, \
.ops = &cygnus_ssp_dai_ops, \ .ops = &cygnus_ssp_dai_ops, \
.suspend = cygnus_ssp_suspend, \
.resume = cygnus_ssp_resume, \
} }
static const struct snd_soc_dai_driver cygnus_ssp_dai_info[] = { static const struct snd_soc_dai_driver cygnus_ssp_dai_info[] = {
@ -1169,14 +1196,14 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = {
SNDRV_PCM_FMTBIT_S32_LE, SNDRV_PCM_FMTBIT_S32_LE,
}, },
.ops = &cygnus_spdif_dai_ops, .ops = &cygnus_spdif_dai_ops,
.suspend = cygnus_ssp_suspend,
.resume = cygnus_ssp_resume,
}; };
static struct snd_soc_dai_driver cygnus_ssp_dai[CYGNUS_MAX_PORTS]; static struct snd_soc_dai_driver cygnus_ssp_dai[CYGNUS_MAX_PORTS];
static const struct snd_soc_component_driver cygnus_ssp_component = { static const struct snd_soc_component_driver cygnus_ssp_component = {
.name = "cygnus-audio", .name = "cygnus-audio",
.suspend = cygnus_ssp_suspend,
.resume = cygnus_ssp_resume,
}; };
/* /*