[Sound-open-firmware] [PATCH] Asoc: sof: Fix usage of aif_in/out
From: Pan Xiuli xiuli.pan@linux.intel.com
We misuse these two defines, now align the usage.
Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com --- sound/soc/sof/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index bef4de1..45d6398 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -887,11 +887,11 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, ret = sof_widget_load_pipeline(scomp, index, swidget, tw, &reply); break; - case snd_soc_dapm_aif_in: + case snd_soc_dapm_aif_out: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_CAPTURE, tw, &reply); break; - case snd_soc_dapm_aif_out: + case snd_soc_dapm_aif_in: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_PLAYBACK, tw, &reply); break;
On Mon, 2017-12-18 at 15:16 +0800, Xiuli Pan wrote:
From: Pan Xiuli xiuli.pan@linux.intel.com
We misuse these two defines, now align the usage.
Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com
sound/soc/sof/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index bef4de1..45d6398 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -887,11 +887,11 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, ret = sof_widget_load_pipeline(scomp, index, swidget, tw, &reply); break;
- case snd_soc_dapm_aif_in:
- case snd_soc_dapm_aif_out: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_CAPTURE, tw, &reply); break;
- case snd_soc_dapm_aif_out:
- case snd_soc_dapm_aif_in: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_PLAYBACK, tw, &reply); break;
Applied.
Liam
Just to clarify, this is matching the change 8b254b5f3de4 ('topology: AIF directions are codec centric wrt PCMs') in soft.git?
If yes, it doesn't hurt to make this reference to help the rest of us figure out which commits are dependent.
Thanks!
On 12/18/2017 01:16 AM, Xiuli Pan wrote:
From: Pan Xiuli xiuli.pan@linux.intel.com
We misuse these two defines, now align the usage.
Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com
sound/soc/sof/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index bef4de1..45d6398 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -887,11 +887,11 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, ret = sof_widget_load_pipeline(scomp, index, swidget, tw, &reply); break;
- case snd_soc_dapm_aif_in:
- case snd_soc_dapm_aif_out: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_CAPTURE, tw, &reply); break;
- case snd_soc_dapm_aif_out:
- case snd_soc_dapm_aif_in: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_PLAYBACK, tw, &reply); break;
From: Pierre-Louis Bossart [mailto:pierre-louis.bossart@linux.intel.com]
Just to clarify, this is matching the change 8b254b5f3de4 ('topology: AIF directions are codec centric wrt PCMs') in soft.git?
Actually this fix some error. This fix the driver side misuse and 8b254b5f3de4 fix the topology side misuse. We should obey the usage from alsa, which you can find by grep AIF_IN/OUT in some codec drivers.
If yes, it doesn't hurt to make this reference to help the rest of us figure out which commits are dependent.
Yes, these fix is confusing and make regressions. May need more clarification.
Thanks Xiuli
Thanks!
On 12/18/2017 01:16 AM, Xiuli Pan wrote:
From: Pan Xiuli xiuli.pan@linux.intel.com
We misuse these two defines, now align the usage.
Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com
sound/soc/sof/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index bef4de1..45d6398 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -887,11 +887,11 @@ static int sof_widget_ready(struct
snd_soc_component *scomp, int index,
ret = sof_widget_load_pipeline(scomp, index, swidget, tw, &reply); break;
- case snd_soc_dapm_aif_in:
- case snd_soc_dapm_aif_out: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_CAPTURE, tw, &reply); break;
- case snd_soc_dapm_aif_out:
- case snd_soc_dapm_aif_in: ret = sof_widget_load_pcm(scomp, index, swidget, SOF_IPC_STREAM_PLAYBACK, tw, &reply); break;
participants (4)
-
Liam Girdwood -
Pan, Xiuli -
Pierre-Louis Bossart -
Xiuli Pan