[alsa-devel] [RFC][PATCH 1/x] ASoC: snd_soc_component_driver has snd_pcm_ops
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Tue Jun 20 04:26:40 CEST 2017
snd_soc_platform_driver has snd_pcm_ops,
and it will be replaced into snd_soc_component_driver in the future.
To prepare it, component driver has it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
include/sound/soc.h | 5 ++-
sound/soc/davinci/davinci-i2s.c | 15 +++++++--
sound/soc/soc-core.c | 23 ++++++++++---
sound/soc/soc-pcm.c | 71 +++++++++++++++++++++++++++++++++++------
4 files changed, 97 insertions(+), 17 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9c94b97..341a958 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -809,6 +809,8 @@ struct snd_soc_component_driver {
int subseq);
int (*stream_event)(struct snd_soc_component *, int event);
+ const struct snd_pcm_ops *ops;
+
/* probe ordering - for components with runtime dependencies */
int probe_order;
int remove_order;
@@ -1230,7 +1232,8 @@ struct snd_soc_pcm_runtime {
struct snd_pcm *pcm;
struct snd_compr *compr;
struct snd_soc_codec *codec;
- struct snd_soc_platform *platform;
+ struct snd_soc_platform *platform; /* will be removed */
+ struct snd_soc_component *platform_com;
struct snd_soc_dai *codec_dai;
struct snd_soc_dai *cpu_dai;
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 3849616..a90b954 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -191,6 +191,7 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
u32 spcr;
u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST;
@@ -211,7 +212,12 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
if (playback) {
/* Stop the DMA to avoid data loss */
/* while the transmitter is out of reset to handle XSYNCERR */
- if (platform->driver->ops->trigger) {
+ if (platform_com->driver->ops->trigger) {
+ int ret = platform_com->driver->ops->trigger(substream,
+ SNDRV_PCM_TRIGGER_STOP);
+ if (ret < 0)
+ printk(KERN_DEBUG "Playback DMA stop failed\n");
+ } else if (platform->driver->ops->trigger) {
int ret = platform->driver->ops->trigger(substream,
SNDRV_PCM_TRIGGER_STOP);
if (ret < 0)
@@ -233,7 +239,12 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
toggle_clock(dev, playback);
/* Restart the DMA */
- if (platform->driver->ops->trigger) {
+ if (platform_com->driver->ops->trigger) {
+ int ret = platform_com->driver->ops->trigger(substream,
+ SNDRV_PCM_TRIGGER_START);
+ if (ret < 0)
+ printk(KERN_DEBUG "Playback DMA start failed\n");
+ } else if (platform->driver->ops->trigger) {
int ret = platform->driver->ops->trigger(substream,
SNDRV_PCM_TRIGGER_START);
if (ret < 0)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index cfa9cf1..95ab9f6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1100,6 +1100,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
}
rtd->platform = platform;
+ rtd->platform_com = &platform->component;
}
if (!rtd->platform) {
dev_err(card->dev, "ASoC: platform %s not registered\n",
@@ -1172,11 +1173,14 @@ static void soc_remove_link_components(struct snd_soc_card *card,
{
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_component *component;
int i;
/* remove the platform */
- if (platform && platform->component.driver->remove_order == order)
+ if (platform_com && platform_com->driver->remove_order == order)
+ soc_remove_component(platform_com);
+ else if (platform && platform->component.driver->remove_order == order)
soc_remove_component(&platform->component);
/* remove the CODEC-side CODEC */
@@ -1543,6 +1547,7 @@ static int soc_probe_link_components(struct snd_soc_card *card,
int order)
{
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_component *component;
int i, ret;
@@ -1565,7 +1570,11 @@ static int soc_probe_link_components(struct snd_soc_card *card,
}
/* probe the platform */
- if (platform->component.driver->probe_order == order) {
+ if (platform_com->driver->probe_order == order) {
+ ret = soc_probe_component(card, platform_com);
+ if (ret < 0)
+ return ret;
+ } else if (platform->component.driver->probe_order == order) {
ret = soc_probe_component(card, &platform->component);
if (ret < 0)
return ret;
@@ -3332,8 +3341,11 @@ static void snd_soc_platform_drv_remove(struct snd_soc_component *component)
static int snd_soc_platform_drv_pcm_new(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
- if (platform->driver->pcm_new)
+ if (platform_com->driver->pcm_new)
+ return platform_com->driver->pcm_new(rtd);
+ else if (platform->driver->pcm_new)
return platform->driver->pcm_new(rtd);
else
return 0;
@@ -3343,8 +3355,11 @@ static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm)
{
struct snd_soc_pcm_runtime *rtd = pcm->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
- if (platform->driver->pcm_free)
+ if (platform_com->driver->pcm_free)
+ platform_com->driver->pcm_free(pcm);
+ else if (platform->driver->pcm_free)
platform->driver->pcm_free(pcm);
}
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index efc5831..6d919e6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -450,6 +450,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
const char *codec_dai_name = "multicodec";
@@ -475,7 +476,14 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
}
}
- if (platform->driver->ops && platform->driver->ops->open) {
+ if (platform_com->driver->ops && platform_com->driver->ops->open) {
+ ret = platform_com->driver->ops->open(substream);
+ if (ret < 0) {
+ dev_err(platform_com->dev, "ASoC: can't open platform"
+ " %s: %d\n", platform_com->name, ret);
+ goto platform_err;
+ }
+ } else if (platform->driver->ops && platform->driver->ops->open) {
ret = platform->driver->ops->open(substream);
if (ret < 0) {
dev_err(platform->dev, "ASoC: can't open platform"
@@ -590,7 +598,9 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
codec_dai->driver->ops->shutdown(substream, codec_dai);
}
- if (platform->driver->ops && platform->driver->ops->close)
+ if (platform_com->driver->ops && platform_com->driver->ops->close)
+ platform_com->driver->ops->close(substream);
+ else if (platform->driver->ops && platform->driver->ops->close)
platform->driver->ops->close(substream);
platform_err:
@@ -655,6 +665,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
int i;
@@ -687,7 +698,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
if (rtd->dai_link->ops && rtd->dai_link->ops->shutdown)
rtd->dai_link->ops->shutdown(substream);
- if (platform->driver->ops && platform->driver->ops->close)
+ if (platform_com->driver->ops && platform_com->driver->ops->close)
+ platform_com->driver->ops->close(substream);
+ else if (platform->driver->ops && platform->driver->ops->close)
platform->driver->ops->close(substream);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -741,6 +754,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
int i, ret = 0;
@@ -756,7 +770,14 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
}
}
- if (platform->driver->ops && platform->driver->ops->prepare) {
+ if (platform_com->driver->ops && platform_com->driver->ops->prepare) {
+ ret = platform_com->driver->ops->prepare(substream);
+ if (ret < 0) {
+ dev_err(platform_com->dev, "ASoC: platform prepare error:"
+ " %d\n", ret);
+ goto out;
+ }
+ } else if (platform->driver->ops && platform->driver->ops->prepare) {
ret = platform->driver->ops->prepare(substream);
if (ret < 0) {
dev_err(platform->dev, "ASoC: platform prepare error:"
@@ -847,6 +868,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
int i, ret = 0;
@@ -911,7 +933,14 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
if (ret < 0)
goto interface_err;
- if (platform->driver->ops && platform->driver->ops->hw_params) {
+ if (platform_com->driver->ops && platform_com->driver->ops->hw_params) {
+ ret = platform_com->driver->ops->hw_params(substream, params);
+ if (ret < 0) {
+ dev_err(platform_com->dev, "ASoC: %s hw params failed: %d\n",
+ platform_com->name, ret);
+ goto platform_err;
+ }
+ } else if (platform->driver->ops && platform->driver->ops->hw_params) {
ret = platform->driver->ops->hw_params(substream, params);
if (ret < 0) {
dev_err(platform->dev, "ASoC: %s hw params failed: %d\n",
@@ -959,6 +988,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
bool playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
@@ -995,7 +1025,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
rtd->dai_link->ops->hw_free(substream);
/* free any DMA resources */
- if (platform->driver->ops && platform->driver->ops->hw_free)
+ if (platform_com->driver->ops && platform_com->driver->ops->hw_free)
+ platform_com->driver->ops->hw_free(substream);
+ else if (platform->driver->ops && platform->driver->ops->hw_free)
platform->driver->ops->hw_free(substream);
/* now free hw params for the DAIs */
@@ -1016,6 +1048,7 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
int i, ret;
@@ -1030,7 +1063,11 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
}
}
- if (platform->driver->ops && platform->driver->ops->trigger) {
+ if (platform_com->driver->ops && platform_com->driver->ops->trigger) {
+ ret = platform_com->driver->ops->trigger(substream, cmd);
+ if (ret < 0)
+ return ret;
+ } else if (platform->driver->ops && platform->driver->ops->trigger) {
ret = platform->driver->ops->trigger(substream, cmd);
if (ret < 0)
return ret;
@@ -1086,6 +1123,7 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai;
struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1094,7 +1132,9 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
snd_pcm_sframes_t codec_delay = 0;
int i;
- if (platform->driver->ops && platform->driver->ops->pointer)
+ if (platform_com->driver->ops && platform_com->driver->ops->pointer)
+ offset = platform_com->driver->ops->pointer(substream);
+ else if (platform->driver->ops && platform->driver->ops->pointer)
offset = platform->driver->ops->pointer(substream);
if (cpu_dai->driver->ops && cpu_dai->driver->ops->delay)
@@ -2281,9 +2321,13 @@ static int soc_pcm_ioctl(struct snd_pcm_substream *substream,
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
- if (platform->driver->ops && platform->driver->ops->ioctl)
+ if (platform_com->driver->ops && platform_com->driver->ops->ioctl)
+ return platform_com->driver->ops->ioctl(substream, cmd, arg);
+ else if (platform->driver->ops && platform->driver->ops->ioctl)
return platform->driver->ops->ioctl(substream, cmd, arg);
+
return snd_pcm_lib_ioctl(substream, cmd, arg);
}
@@ -2644,6 +2688,7 @@ static void soc_pcm_free(struct snd_pcm *pcm)
int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
{
struct snd_soc_platform *platform = rtd->platform;
+ struct snd_soc_component *platform_com = rtd->platform_com;
struct snd_soc_dai *codec_dai;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_component *component;
@@ -2741,7 +2786,13 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
rtd->ops.ioctl = soc_pcm_ioctl;
}
- if (platform->driver->ops) {
+ if (platform_com->driver->ops) {
+ rtd->ops.ack = platform_com->driver->ops->ack;
+ rtd->ops.copy = platform_com->driver->ops->copy;
+ rtd->ops.silence = platform_com->driver->ops->silence;
+ rtd->ops.page = platform_com->driver->ops->page;
+ rtd->ops.mmap = platform_com->driver->ops->mmap;
+ } else if (platform->driver->ops) {
rtd->ops.ack = platform->driver->ops->ack;
rtd->ops.copy = platform->driver->ops->copy;
rtd->ops.silence = platform->driver->ops->silence;
--
1.9.1
More information about the Alsa-devel
mailing list