[PATCH 1/3] ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s.

[PATCH 1/3] ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s.

[Ian Lartey]

Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
---
 sound/soc/pxa/imote2.c   |    2 +-
 sound/soc/pxa/magician.c |    2 +-
 sound/soc/pxa/poodle.c   |    2 +-
 sound/soc/pxa/z2.c       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index 03765fc..154fc6f 100644
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -63,7 +63,7 @@ static struct snd_soc_ops imote2_asoc_ops = {
 static struct snd_soc_dai_link imote2_dai = {
 	.name = "WM8940",
 	.stream_name = "WM8940",
-	.cpu_dai_name = "pxa-i2s",
+	.cpu_dai_name = "pxa2xx-i2s",
 	.codec_dai_name = "wm8940-hifi",
 	.platform_name = "pxa-pcm-audio",
 	.codec_name = "wm8940-codec.0-0034",
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 608bc3d..b8207ce 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -437,7 +437,7 @@ static struct snd_soc_dai_link magician_dai[] = {
 {
 	.name = "uda1380",
 	.stream_name = "UDA1380 Capture",
-	.cpu_dai_name = "pxa-i2s",
+	.cpu_dai_name = "pxa2xx-i2s",
 	.codec_dai_name = "uda1380-hifi-capture",
 	.platform_name = "pxa-pcm-audio",
 	.codec_name = "uda1380-codec.0-0018",
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index fa752f6..af84ee9 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -266,7 +266,7 @@ static int poodle_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_dai_link poodle_dai = {
 	.name = "WM8731",
 	.stream_name = "WM8731",
-	.cpu_dai_name = "pxa-i2s",
+	.cpu_dai_name = "pxa2xx-i2s",
 	.codec_dai_name = "wm8731-hifi",
 	.platform_name = "pxa-pcm-audio",
 	.codec_name = "wm8731-codec.0-001a",
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 704f74b..4cc841b 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -189,7 +189,7 @@ static struct snd_soc_ops z2_ops = {
 static struct snd_soc_dai_link z2_dai = {
 	.name		= "wm8750",
 	.stream_name	= "WM8750",
-	.cpu_dai_name	= "pxa-i2s",
+	.cpu_dai_name	= "pxa2xx-i2s",
 	.codec_dai_name	= "wm8750-hifi",
 	.platform_name = "pxa-pcm-audio",
 	.codec_name	= "wm8750-codec.0-001a",
-- 
1.7.0.4

[PATCH 2/3] ASoC: Make codec dai naming for WM8741 consistent

[Ian Lartey]

Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm8741.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 782fe53..fdd24da 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -311,7 +311,7 @@ static struct snd_soc_dai_ops wm8741_dai_ops = {
 };
 
 static struct snd_soc_dai_driver wm8741_dai = {
-	.name = "WM8741",
+	.name = "wm8741",
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 2,  /* Mono modes not yet supported */
-- 
1.7.0.4

[PATCH 3/3] ASoC: Enable autoloading of pxa2xx CPU I2S driver with module alias

[Ian Lartey]

Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
---
 sound/soc/pxa/pxa2xx-i2s.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index d1b2ca6..11be595 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -398,3 +398,4 @@ module_exit(pxa2xx_i2s_exit);
 MODULE_AUTHOR("Liam Girdwood, lrg@slimlogic.co.uk");
 MODULE_DESCRIPTION("pxa2xx I2S SoC Interface");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-i2s");
-- 
1.7.0.4

Re: [PATCH 1/3] ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s.

[Liam Girdwood]

On Fri, 2010-08-20 at 17:18 +0100, Ian Lartey wrote:
> Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
> ---
>  sound/soc/pxa/imote2.c   |    2 +-
>  sound/soc/pxa/magician.c |    2 +-
>  sound/soc/pxa/poodle.c   |    2 +-
>  sound/soc/pxa/z2.c       |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)

All

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH 1/3] ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s.

[Mark Brown]

On Mon, Aug 23, 2010 at 01:33:52PM +0100, Liam Girdwood wrote:
> On Fri, 2010-08-20 at 17:18 +0100, Ian Lartey wrote:
> > Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
> > ---
> >  sound/soc/pxa/imote2.c   |    2 +-
> >  sound/soc/pxa/magician.c |    2 +-
> >  sound/soc/pxa/poodle.c   |    2 +-
> >  sound/soc/pxa/z2.c       |    2 +-
> >  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> All
> 
> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

Applied, thanks.