* [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver
@ 2011-12-17 7:36 Axel Lin
2011-12-17 7:41 ` [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 " Axel Lin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Axel Lin @ 2011-12-17 7:36 UTC (permalink / raw)
To: alsa-devel; +Cc: Mika Westerberg, Mark Brown, Alexander Sverdlin, Liam Girdwood
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/ep93xx/edb93xx.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c
index 6b90c75..9f6fecd 100644
--- a/sound/soc/ep93xx/edb93xx.c
+++ b/sound/soc/ep93xx/edb93xx.c
@@ -48,18 +48,6 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream,
else
mclk_rate = rate * 64 * 2;
- err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
- if (err)
- return err;
-
- err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
- if (err)
- return err;
-
err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate,
SND_SOC_CLOCK_IN);
if (err)
@@ -80,6 +68,8 @@ static struct snd_soc_dai_link edb93xx_dai = {
.cpu_dai_name = "ep93xx-i2s",
.codec_name = "spi0.0",
.codec_dai_name = "cs4271-hifi",
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
+ SND_SOC_DAIFMT_CBS_CFS,
.ops = &edb93xx_ops,
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 machine driver
2011-12-17 7:36 [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver Axel Lin
@ 2011-12-17 7:41 ` Axel Lin
2011-12-19 9:11 ` Mika Westerberg
2011-12-18 8:45 ` [PATCH 1/2] ASoC: Use dai_fmt in edb93xx " Alexander Sverdlin
2011-12-20 0:52 ` Mark Brown
2 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2011-12-17 7:41 UTC (permalink / raw)
To: alsa-devel; +Cc: Mika Westerberg, Mark Brown, Alexander Sverdlin, Liam Girdwood
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/ep93xx/snappercl15.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index 33901d6..e97cd57 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -33,16 +33,6 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
int err;
- err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
-
- err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_NB_IF |
- SND_SOC_DAIFMT_CBS_CFS);
- if (err)
- return err;
-
err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK,
SND_SOC_CLOCK_IN);
if (err)
@@ -96,6 +86,8 @@ static struct snd_soc_dai_link snappercl15_dai = {
.codec_name = "tlv320aic23-codec.0-001a",
.platform_name = "ep93xx-pcm-audio",
.init = snappercl15_tlv320aic23_init,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
+ SND_SOC_DAIFMT_CBS_CFS,
.ops = &snappercl15_ops,
};
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 machine driver
2011-12-17 7:41 ` [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 " Axel Lin
@ 2011-12-19 9:11 ` Mika Westerberg
0 siblings, 0 replies; 5+ messages in thread
From: Mika Westerberg @ 2011-12-19 9:11 UTC (permalink / raw)
To: Axel Lin; +Cc: alsa-devel, Mark Brown, Alexander Sverdlin, Liam Girdwood
On Sat, Dec 17, 2011 at 03:41:11PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
> ---
> sound/soc/ep93xx/snappercl15.c | 12 ++----------
> 1 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
> index 33901d6..e97cd57 100644
> --- a/sound/soc/ep93xx/snappercl15.c
> +++ b/sound/soc/ep93xx/snappercl15.c
> @@ -33,16 +33,6 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream,
> struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
> int err;
>
> - err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
> - SND_SOC_DAIFMT_NB_IF |
> - SND_SOC_DAIFMT_CBS_CFS);
> -
> - err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
> - SND_SOC_DAIFMT_NB_IF |
> - SND_SOC_DAIFMT_CBS_CFS);
> - if (err)
> - return err;
> -
> err = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK,
> SND_SOC_CLOCK_IN);
> if (err)
> @@ -96,6 +86,8 @@ static struct snd_soc_dai_link snappercl15_dai = {
> .codec_name = "tlv320aic23-codec.0-001a",
> .platform_name = "ep93xx-pcm-audio",
> .init = snappercl15_tlv320aic23_init,
> + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
> + SND_SOC_DAIFMT_CBS_CFS,
> .ops = &snappercl15_ops,
> };
>
> --
> 1.7.5.4
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver
2011-12-17 7:36 [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver Axel Lin
2011-12-17 7:41 ` [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 " Axel Lin
@ 2011-12-18 8:45 ` Alexander Sverdlin
2011-12-20 0:52 ` Mark Brown
2 siblings, 0 replies; 5+ messages in thread
From: Alexander Sverdlin @ 2011-12-18 8:45 UTC (permalink / raw)
To: Axel Lin; +Cc: alsa-devel, Mark Brown, Mika Westerberg, Liam Girdwood
Hello!
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
On Sat, 2011-12-17 at 15:36 +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/ep93xx/edb93xx.c | 14 ++------------
> 1 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c
> index 6b90c75..9f6fecd 100644
> --- a/sound/soc/ep93xx/edb93xx.c
> +++ b/sound/soc/ep93xx/edb93xx.c
> @@ -48,18 +48,6 @@ static int edb93xx_hw_params(struct snd_pcm_substream *substream,
> else
> mclk_rate = rate * 64 * 2;
>
> - err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
> - SND_SOC_DAIFMT_NB_IF |
> - SND_SOC_DAIFMT_CBS_CFS);
> - if (err)
> - return err;
> -
> - err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
> - SND_SOC_DAIFMT_NB_IF |
> - SND_SOC_DAIFMT_CBS_CFS);
> - if (err)
> - return err;
> -
> err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk_rate,
> SND_SOC_CLOCK_IN);
> if (err)
> @@ -80,6 +68,8 @@ static struct snd_soc_dai_link edb93xx_dai = {
> .cpu_dai_name = "ep93xx-i2s",
> .codec_name = "spi0.0",
> .codec_dai_name = "cs4271-hifi",
> + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
> + SND_SOC_DAIFMT_CBS_CFS,
> .ops = &edb93xx_ops,
> };
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver
2011-12-17 7:36 [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver Axel Lin
2011-12-17 7:41 ` [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 " Axel Lin
2011-12-18 8:45 ` [PATCH 1/2] ASoC: Use dai_fmt in edb93xx " Alexander Sverdlin
@ 2011-12-20 0:52 ` Mark Brown
2 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-12-20 0:52 UTC (permalink / raw)
To: Axel Lin; +Cc: alsa-devel, Alexander Sverdlin, Mika Westerberg, Liam Girdwood
On Sat, Dec 17, 2011 at 03:36:52PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied both, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-20 0:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-17 7:36 [PATCH 1/2] ASoC: Use dai_fmt in edb93xx machine driver Axel Lin
2011-12-17 7:41 ` [PATCH 2/2] ASoC: Use dai_fmt in snappercl15 " Axel Lin
2011-12-19 9:11 ` Mika Westerberg
2011-12-18 8:45 ` [PATCH 1/2] ASoC: Use dai_fmt in edb93xx " Alexander Sverdlin
2011-12-20 0:52 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.