* [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
@ 2011-01-21 19:14 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-01-21 19:14 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, stable, linux-arm-kernel
ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
contained incorrect names for cpu_dai and codec, which effectievly disabled sound
on theese platforms. Fix that errors.
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
sound/soc/pxa/corgi.c | 4 ++--
sound/soc/pxa/poodle.c | 2 +-
sound/soc/pxa/spitz.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index f451acd..135d903 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -305,10 +305,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link corgi_dai = {
.name = "WM8731",
.stream_name = "WM8731",
- .cpu_dai_name = "pxa-is2-dai",
+ .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8731-codec-0.001a",
+ .codec_name = "wm8731-codec-0.001b",
.init = corgi_wm8731_init,
.ops = &corgi_ops,
};
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 84edd03..0eebe11 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -274,7 +274,7 @@ static struct snd_soc_dai_link poodle_dai = {
.cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8731-codec.0-001a",
+ .codec_name = "wm8731-codec.0-001b",
.init = poodle_wm8731_init,
.ops = &poodle_ops,
};
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0b30d7d..7604471 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -313,10 +313,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link spitz_dai = {
.name = "wm8750",
.stream_name = "WM8750",
- .cpu_dai_name = "pxa-is2",
+ .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8750-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8750-codec.0-001a",
+ .codec_name = "wm8750-codec.0-001b",
.init = spitz_wm8750_init,
.ops = &spitz_ops,
};
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
@ 2011-01-21 19:14 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-01-21 19:14 UTC (permalink / raw)
To: linux-arm-kernel
ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
contained incorrect names for cpu_dai and codec, which effectievly disabled sound
on theese platforms. Fix that errors.
Cc: stable at vger.kernel.org
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
sound/soc/pxa/corgi.c | 4 ++--
sound/soc/pxa/poodle.c | 2 +-
sound/soc/pxa/spitz.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index f451acd..135d903 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -305,10 +305,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link corgi_dai = {
.name = "WM8731",
.stream_name = "WM8731",
- .cpu_dai_name = "pxa-is2-dai",
+ .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8731-codec-0.001a",
+ .codec_name = "wm8731-codec-0.001b",
.init = corgi_wm8731_init,
.ops = &corgi_ops,
};
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 84edd03..0eebe11 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -274,7 +274,7 @@ static struct snd_soc_dai_link poodle_dai = {
.cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8731-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8731-codec.0-001a",
+ .codec_name = "wm8731-codec.0-001b",
.init = poodle_wm8731_init,
.ops = &poodle_ops,
};
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0b30d7d..7604471 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -313,10 +313,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link spitz_dai = {
.name = "wm8750",
.stream_name = "WM8750",
- .cpu_dai_name = "pxa-is2",
+ .cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "wm8750-hifi",
.platform_name = "pxa-pcm-audio",
- .codec_name = "wm8750-codec.0-001a",
+ .codec_name = "wm8750-codec.0-001b",
.init = spitz_wm8750_init,
.ops = &spitz_ops,
};
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
2011-01-21 19:14 ` Dmitry Eremin-Solenikov
@ 2011-01-25 15:03 ` Mark Brown
-1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-01-25 15:03 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov; +Cc: alsa-devel, stable, linux-arm-kernel, lrg
On Fri, Jan 21, 2011 at 10:14:17PM +0300, Dmitry Eremin-Solenikov wrote:
> ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
> contained incorrect names for cpu_dai and codec, which effectievly disabled sound
> on theese platforms. Fix that errors.
Ccing in Liam who you forgot to CC - please make sure you CC all
maintainers on patches.
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> sound/soc/pxa/corgi.c | 4 ++--
> sound/soc/pxa/poodle.c | 2 +-
> sound/soc/pxa/spitz.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
> index f451acd..135d903 100644
> --- a/sound/soc/pxa/corgi.c
> +++ b/sound/soc/pxa/corgi.c
> @@ -305,10 +305,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
> static struct snd_soc_dai_link corgi_dai = {
> .name = "WM8731",
> .stream_name = "WM8731",
> - .cpu_dai_name = "pxa-is2-dai",
> + .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8731-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8731-codec-0.001a",
> + .codec_name = "wm8731-codec-0.001b",
> .init = corgi_wm8731_init,
> .ops = &corgi_ops,
> };
> diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
> index 84edd03..0eebe11 100644
> --- a/sound/soc/pxa/poodle.c
> +++ b/sound/soc/pxa/poodle.c
> @@ -274,7 +274,7 @@ static struct snd_soc_dai_link poodle_dai = {
> .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8731-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8731-codec.0-001a",
> + .codec_name = "wm8731-codec.0-001b",
> .init = poodle_wm8731_init,
> .ops = &poodle_ops,
> };
> diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
> index 0b30d7d..7604471 100644
> --- a/sound/soc/pxa/spitz.c
> +++ b/sound/soc/pxa/spitz.c
> @@ -313,10 +313,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
> static struct snd_soc_dai_link spitz_dai = {
> .name = "wm8750",
> .stream_name = "WM8750",
> - .cpu_dai_name = "pxa-is2",
> + .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8750-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8750-codec.0-001a",
> + .codec_name = "wm8750-codec.0-001b",
> .init = spitz_wm8750_init,
> .ops = &spitz_ops,
> };
> --
> 1.7.2.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
@ 2011-01-25 15:03 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-01-25 15:03 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 21, 2011 at 10:14:17PM +0300, Dmitry Eremin-Solenikov wrote:
> ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
> contained incorrect names for cpu_dai and codec, which effectievly disabled sound
> on theese platforms. Fix that errors.
Ccing in Liam who you forgot to CC - please make sure you CC all
maintainers on patches.
> Cc: stable at vger.kernel.org
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> sound/soc/pxa/corgi.c | 4 ++--
> sound/soc/pxa/poodle.c | 2 +-
> sound/soc/pxa/spitz.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
> index f451acd..135d903 100644
> --- a/sound/soc/pxa/corgi.c
> +++ b/sound/soc/pxa/corgi.c
> @@ -305,10 +305,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
> static struct snd_soc_dai_link corgi_dai = {
> .name = "WM8731",
> .stream_name = "WM8731",
> - .cpu_dai_name = "pxa-is2-dai",
> + .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8731-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8731-codec-0.001a",
> + .codec_name = "wm8731-codec-0.001b",
> .init = corgi_wm8731_init,
> .ops = &corgi_ops,
> };
> diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
> index 84edd03..0eebe11 100644
> --- a/sound/soc/pxa/poodle.c
> +++ b/sound/soc/pxa/poodle.c
> @@ -274,7 +274,7 @@ static struct snd_soc_dai_link poodle_dai = {
> .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8731-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8731-codec.0-001a",
> + .codec_name = "wm8731-codec.0-001b",
> .init = poodle_wm8731_init,
> .ops = &poodle_ops,
> };
> diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
> index 0b30d7d..7604471 100644
> --- a/sound/soc/pxa/spitz.c
> +++ b/sound/soc/pxa/spitz.c
> @@ -313,10 +313,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
> static struct snd_soc_dai_link spitz_dai = {
> .name = "wm8750",
> .stream_name = "WM8750",
> - .cpu_dai_name = "pxa-is2",
> + .cpu_dai_name = "pxa2xx-i2s",
> .codec_dai_name = "wm8750-hifi",
> .platform_name = "pxa-pcm-audio",
> - .codec_name = "wm8750-codec.0-001a",
> + .codec_name = "wm8750-codec.0-001b",
> .init = spitz_wm8750_init,
> .ops = &spitz_ops,
> };
> --
> 1.7.2.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
2011-01-25 15:03 ` Mark Brown
@ 2011-01-25 15:16 ` Liam Girdwood
-1 siblings, 0 replies; 6+ messages in thread
From: Liam Girdwood @ 2011-01-25 15:16 UTC (permalink / raw)
To: Mark Brown; +Cc: Dmitry Eremin-Solenikov, alsa-devel, stable, linux-arm-kernel
On Tue, 2011-01-25 at 15:03 +0000, Mark Brown wrote:
> On Fri, Jan 21, 2011 at 10:14:17PM +0300, Dmitry Eremin-Solenikov wrote:
> > ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
> > contained incorrect names for cpu_dai and codec, which effectievly disabled sound
> > on theese platforms. Fix that errors.
>
> Ccing in Liam who you forgot to CC - please make sure you CC all
> maintainers on patches.
>
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> > ---
> > sound/soc/pxa/corgi.c | 4 ++--
> > sound/soc/pxa/poodle.c | 2 +-
> > sound/soc/pxa/spitz.c | 4 ++--
> > 3 files changed, 5 insertions(+), 5 deletions(-)
> >
Looks fine to me.
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: correct link specifications for corgi, poodle and spitz
@ 2011-01-25 15:16 ` Liam Girdwood
0 siblings, 0 replies; 6+ messages in thread
From: Liam Girdwood @ 2011-01-25 15:16 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2011-01-25 at 15:03 +0000, Mark Brown wrote:
> On Fri, Jan 21, 2011 at 10:14:17PM +0300, Dmitry Eremin-Solenikov wrote:
> > ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
> > contained incorrect names for cpu_dai and codec, which effectievly disabled sound
> > on theese platforms. Fix that errors.
>
> Ccing in Liam who you forgot to CC - please make sure you CC all
> maintainers on patches.
>
> > Cc: stable at vger.kernel.org
> > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> > ---
> > sound/soc/pxa/corgi.c | 4 ++--
> > sound/soc/pxa/poodle.c | 2 +-
> > sound/soc/pxa/spitz.c | 4 ++--
> > 3 files changed, 5 insertions(+), 5 deletions(-)
> >
Looks fine to me.
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-25 15:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-21 19:14 [PATCH] ASoC: correct link specifications for corgi, poodle and spitz Dmitry Eremin-Solenikov
2011-01-21 19:14 ` Dmitry Eremin-Solenikov
2011-01-25 15:03 ` Mark Brown
2011-01-25 15:03 ` Mark Brown
2011-01-25 15:16 ` Liam Girdwood
2011-01-25 15:16 ` Liam Girdwood
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.