pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform
Subsystems (5)
PATCH 1/3 pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform
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.
--- arch/arm/mach-pxa/pxa25x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/pxa25x.c +1 -0
@@ -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[] = {
Signature · 1 line
1.7.2.3
PATCH 1/3 pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform
Eric, will it be possible to get at least this patch in the kernel?
Otherwise all ASoC-based audio on pxa25x isn't working.
Quoted 27 lines · Dmitry Eremin-Solenikov
pxa25x platforms were left out of major ASoC Update patch. Since
f0fba2ad1ba 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 <[email protected]>Cc Eric Miao <[email protected]>--- arch/arm/mach-pxa/pxa25x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/mach-pxa/pxa25x.c +1
-0@@ -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_devicepxa25x_sysdev[] = {
--
1.7.2.3
Signature · 2 lines
With best wishes Dmitry
PATCH 1/3 pxa: Enable pxa-pcm-audio on pxa210/pxa25x platform
Quoted 3 lines · Dmitry Eremin-Solenikov
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.
Quoted 35 lines · Dmitry Eremin-Solenikov
Quoted 22 lines
pxa25x platforms were left out of major ASoC Update patch. Since
f0fba2ad1ba 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 <[email protected]>Cc Eric Miao <[email protected]>---
?arch/arm/mach-pxa/pxa25x.c | ? ?1 +
?1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/mach-pxa/pxa25x.c +1
-0@@ -347,6 +347,7 @@ static struct platform_device *pxa25x_devices[]__initdata = { ? ? ? &pxa25x_device_assp, ? ? ? &pxa25x_device_pwm0, ? ? ? &pxa25x_device_pwm1, + ? ? &pxa_device_asoc_platform, ?};Quoted 5 lines
?static struct
sys_devicepxa25x_sysdev[] = {
--
1.7.2.3--
With best wishes
Dmitry
PATCH 2/3 tosa: register wm9712 codec device
In reply to Dmitry Eremin-SolenikovSince f0fba2ad1b it's required to register platform devices even for AC'97 codecs. Register one on tosa (wm9712-codec).
--- arch/arm/mach-pxa/tosa.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/tosa.c +6 -0
@@ -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 )
Signature · 1 line
1.7.2.3
Quoted 15 lines · Dmitry Eremin-Solenikov
pxa25x platforms were left out of major ASoC Update patch. Since
f0fba2ad1ba 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 <[email protected]>Cc Eric Miao <[email protected]>--- arch/arm/mach-pxa/pxa25x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)arch/arm/mach-pxa/pxa25x.c +0
-0
arch/arm/mach-pxa/pxa25x.c static struct platform_device *pxa25x_devices[] __initdata = { · line 353
Quoted 7 lines
arch/arm/mach-pxa/pxa25x.c +1
-0@@ -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
PATCH 3/3 ASoC: correct pxa AC97 DAI names
In reply to Dmitry Eremin-SolenikovCorrect names for pxa AC97 DAI are pxa2xx-ac97 and pxa2xx-ac97-aux. Fix that for all PXA platforms.
--- 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(-)
sound/soc/pxa/e740_wm9705.c +2 -2
@@ -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",
sound/soc/pxa/e750_wm9705.c +2 -2
@@ -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",
sound/soc/pxa/e800_wm9712.c +2 -2
@@ -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",
sound/soc/pxa/em-x270.c +2 -2
@@ -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",
sound/soc/pxa/mioa701_wm9713.c +2 -2
@@ -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",
sound/soc/pxa/palm27x.c +2 -2
@@ -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",
sound/soc/pxa/tosa.c +2 -2
@@ -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",
sound/soc/pxa/zylonite.c +2 -2
@@ -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", }, {
Signature · 1 line
1.7.2.3
Re: [PATCH 3/3] ASoC: correct pxa AC97 DAI names
Quoted 4 lines · Dmitry Eremin-Solenikov
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 <[email protected]>
Applied, thanks. Others