* [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform
@ 2011-02-22 23:29 Dmitry Eremin-Solenikov
2011-02-22 23:29 ` [PATCH 2/3] tosa: register wm9712 codec device Dmitry Eremin-Solenikov
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-02-22 23:29 UTC (permalink / raw)
To: linux-arm-kernel
pxa25x platforms were left out of major ASoC Update patch.
Since f0fba2ad1b a registration of pxa-pcm-audio device is required for
ASoC to function on pxa platforms. Register one also for pxa210/pxa25x.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/pxa25x.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index fbc5b77..b166b1d 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -347,6 +347,7 @@ static struct platform_device *pxa25x_devices[] __initdata = {
&pxa25x_device_assp,
&pxa25x_device_pwm0,
&pxa25x_device_pwm1,
+ &pxa_device_asoc_platform,
};
static struct sys_device pxa25x_sysdev[] = {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/3] tosa: register wm9712 codec device 2011-02-22 23:29 [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Dmitry Eremin-Solenikov @ 2011-02-22 23:29 ` Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 3/3] ASoC: correct pxa AC97 DAI names Dmitry Eremin-Solenikov ` (2 subsequent siblings) 3 siblings, 0 replies; 7+ messages in thread From: Dmitry Eremin-Solenikov @ 2011-02-22 23:29 UTC (permalink / raw) To: linux-arm-kernel Since f0fba2ad1b it's required to register platform devices even for AC'97 codecs. Register one on tosa (wm9712-codec). Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> --- arch/arm/mach-pxa/tosa.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 88b2329..7753d22 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -884,6 +884,11 @@ static struct platform_device sharpsl_rom_device = { .dev.platform_data = &sharpsl_rom_data, }; +static struct platform_device wm9712_device = { + .name = "wm9712-codec", + .id = -1, +}; + static struct platform_device *devices[] __initdata = { &tosascoop_device, &tosascoop_jc_device, @@ -895,6 +900,7 @@ static struct platform_device *devices[] __initdata = { &tosa_bt_device, &sharpsl_rom_device, &tosa_gpio_vbus, + &wm9712_device, }; static void tosa_poweroff(void) -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ASoC: correct pxa AC97 DAI names 2011-02-22 23:29 [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 2/3] tosa: register wm9712 codec device Dmitry Eremin-Solenikov @ 2011-02-22 23:29 ` Dmitry Eremin-Solenikov 2011-02-24 11:00 ` Mark Brown 2011-02-23 21:13 ` [alsa-devel] [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Liam Girdwood 2011-02-25 10:47 ` Dmitry Eremin-Solenikov 3 siblings, 1 reply; 7+ messages in thread From: Dmitry Eremin-Solenikov @ 2011-02-22 23:29 UTC (permalink / raw) To: linux-arm-kernel Correct names for pxa AC97 DAI are pxa2xx-ac97 and pxa2xx-ac97-aux. Fix that for all PXA platforms. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- sound/soc/pxa/e740_wm9705.c | 4 ++-- sound/soc/pxa/e750_wm9705.c | 4 ++-- sound/soc/pxa/e800_wm9712.c | 4 ++-- sound/soc/pxa/em-x270.c | 4 ++-- sound/soc/pxa/mioa701_wm9713.c | 4 ++-- sound/soc/pxa/palm27x.c | 4 ++-- sound/soc/pxa/tosa.c | 4 ++-- sound/soc/pxa/zylonite.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 28333e7..dc65650 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", @@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9705-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 01bf316..51897fc 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c @@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", @@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9705-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec", diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index c6a37c6..053ed20 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", @@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index fc22e6e..b13a425 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", @@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index 0d70fc8..38ca675 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c @@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", .init = mioa701_wm9713_init, @@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9713-aux", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio", diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 857db96..504e400 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c @@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { { .name = "AC97 HiFi", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", .platform_name = "pxa-pcm-audio", @@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9712-aux", .codec_name = "wm9712-codec", .platform_name = "pxa-pcm-audio", diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index f75804e..4b6e5d6 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", @@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec", diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index b222a7d..25bba10 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c @@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { .stream_name = "AC97 HiFi", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_name = "wm9713-hifi", .init = zylonite_wm9713_init, }, @@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { .stream_name = "AC97 Aux", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_name = "wm9713-aux", }, { -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ASoC: correct pxa AC97 DAI names 2011-02-22 23:29 ` [PATCH 3/3] ASoC: correct pxa AC97 DAI names Dmitry Eremin-Solenikov @ 2011-02-24 11:00 ` Mark Brown 0 siblings, 0 replies; 7+ messages in thread From: Mark Brown @ 2011-02-24 11:00 UTC (permalink / raw) To: linux-arm-kernel On Wed, Feb 23, 2011 at 02:29:11AM +0300, Dmitry Eremin-Solenikov wrote: > Correct names for pxa AC97 DAI are pxa2xx-ac97 and pxa2xx-ac97-aux. Fix > that for all PXA platforms. > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Applied, thanks. Others Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [alsa-devel] [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform 2011-02-22 23:29 [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 2/3] tosa: register wm9712 codec device Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 3/3] ASoC: correct pxa AC97 DAI names Dmitry Eremin-Solenikov @ 2011-02-23 21:13 ` Liam Girdwood 2011-02-25 10:47 ` Dmitry Eremin-Solenikov 3 siblings, 0 replies; 7+ messages in thread From: Liam Girdwood @ 2011-02-23 21:13 UTC (permalink / raw) To: linux-arm-kernel On Wed, 2011-02-23 at 02:29 +0300, Dmitry Eremin-Solenikov wrote: > pxa25x platforms were left out of major ASoC Update patch. > Since f0fba2ad1b a registration of pxa-pcm-audio device is required for > ASoC to function on pxa platforms. Register one also for pxa210/pxa25x. > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > Cc: Eric Miao <eric.y.miao@gmail.com> > --- > arch/arm/mach-pxa/pxa25x.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c > index fbc5b77..b166b1d 100644 > --- a/arch/arm/mach-pxa/pxa25x.c > +++ b/arch/arm/mach-pxa/pxa25x.c > @@ -347,6 +347,7 @@ static struct platform_device *pxa25x_devices[] __initdata = { > &pxa25x_device_assp, > &pxa25x_device_pwm0, > &pxa25x_device_pwm1, > + &pxa_device_asoc_platform, > }; > > static struct sys_device pxa25x_sysdev[] = { All Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform 2011-02-22 23:29 [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Dmitry Eremin-Solenikov ` (2 preceding siblings ...) 2011-02-23 21:13 ` [alsa-devel] [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Liam Girdwood @ 2011-02-25 10:47 ` Dmitry Eremin-Solenikov 2011-02-27 13:36 ` Eric Miao 3 siblings, 1 reply; 7+ messages in thread From: Dmitry Eremin-Solenikov @ 2011-02-25 10:47 UTC (permalink / raw) To: linux-arm-kernel Eric, will it be possible to get at least this patch in the kernel? Otherwise all ASoC-based audio on pxa25x isn't working. On 2/23/11, Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > pxa25x platforms were left out of major ASoC Update patch. > Since f0fba2ad1b a registration of pxa-pcm-audio device is required for > ASoC to function on pxa platforms. Register one also for pxa210/pxa25x. > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > Cc: Eric Miao <eric.y.miao@gmail.com> > --- > arch/arm/mach-pxa/pxa25x.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c > index fbc5b77..b166b1d 100644 > --- a/arch/arm/mach-pxa/pxa25x.c > +++ b/arch/arm/mach-pxa/pxa25x.c > @@ -347,6 +347,7 @@ static struct platform_device *pxa25x_devices[] > __initdata = { > &pxa25x_device_assp, > &pxa25x_device_pwm0, > &pxa25x_device_pwm1, > + &pxa_device_asoc_platform, > }; > > static struct sys_device pxa25x_sysdev[] = { > -- > 1.7.2.3 > > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform 2011-02-25 10:47 ` Dmitry Eremin-Solenikov @ 2011-02-27 13:36 ` Eric Miao 0 siblings, 0 replies; 7+ messages in thread From: Eric Miao @ 2011-02-27 13:36 UTC (permalink / raw) To: linux-arm-kernel On Fri, Feb 25, 2011 at 6:47 PM, Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > Eric, will it be possible to get at least this patch in the kernel? > > Otherwise all ASoC-based audio on pxa25x isn't working. Hrm, this deserves as a fix. Applied. > > On 2/23/11, Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: >> pxa25x platforms were left out of major ASoC Update patch. >> Since f0fba2ad1b a registration of pxa-pcm-audio device is required for >> ASoC to function on pxa platforms. Register one also for pxa210/pxa25x. >> >> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> >> Cc: Eric Miao <eric.y.miao@gmail.com> >> --- >> ?arch/arm/mach-pxa/pxa25x.c | ? ?1 + >> ?1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c >> index fbc5b77..b166b1d 100644 >> --- a/arch/arm/mach-pxa/pxa25x.c >> +++ b/arch/arm/mach-pxa/pxa25x.c >> @@ -347,6 +347,7 @@ static struct platform_device *pxa25x_devices[] >> __initdata = { >> ? ? ? &pxa25x_device_assp, >> ? ? ? &pxa25x_device_pwm0, >> ? ? ? &pxa25x_device_pwm1, >> + ? ? &pxa_device_asoc_platform, >> ?}; >> >> ?static struct sys_device pxa25x_sysdev[] = { >> -- >> 1.7.2.3 >> >> > > > -- > With best wishes > Dmitry > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-02-27 13:36 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-22 23:29 [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 2/3] tosa: register wm9712 codec device Dmitry Eremin-Solenikov 2011-02-22 23:29 ` [PATCH 3/3] ASoC: correct pxa AC97 DAI names Dmitry Eremin-Solenikov 2011-02-24 11:00 ` Mark Brown 2011-02-23 21:13 ` [alsa-devel] [PATCH 1/3] pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform Liam Girdwood 2011-02-25 10:47 ` Dmitry Eremin-Solenikov 2011-02-27 13:36 ` Eric Miao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).