Skip to contentSkip to conversation

ASoC: Convert pxa machine drivers to use use snd_soc_register_card()

PATCH Applied Axel Lin 2 participants 7 messages Dec 15, 2011 – Dec 17, 2011

Subsystems (5)
Arm (32-bit) Sound Arm sub-architectures ASoC +1 more subsystems
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

cover ASoC: Convert pxa machine drivers to use use snd_soc_register_card()

This serial converts some pxa machine drivers to use use snd_soc_register_card().

Note: I don't have these hardware, so I appreciate if someone can test these patches.

Axel Lin (5):
ASoC: pxa: Convert e740_wm9705 to use snd_soc_register_card()
ASoC: pxa: Convert e750_wm9705 to use snd_soc_register_card()
ASoC: pxa: Convert e800_wm9712 to use snd_soc_register_card()
ASoC: pxa: Convert imote2 to use snd_soc_register_card()
ASoC: pxa: Convert tosa to use snd_soc_register_card()

 arch/arm/mach-pxa/eseries.c   |   18 +++++++++
 arch/arm/mach-pxa/stargate2.c |    6 +++
 arch/arm/mach-pxa/tosa.c      |    6 +++
 sound/soc/pxa/e740_wm9705.c   |   75 +++++++++++++++++-----------------------
 sound/soc/pxa/e750_wm9705.c   |   66 ++++++++++++++++------------------
 sound/soc/pxa/e800_wm9712.c   |   66 ++++++++++++++++------------------
 sound/soc/pxa/imote2.c        |   41 +++++++++++++---------
 sound/soc/pxa/tosa.c          |   77 ++++++++++++++++-------------------------
 8 files changed, 178 insertions(+), 177 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/5 ASoC: pxa: Convert e740_wm9705 to use snd_soc_register_card()

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by Axel Lin <[email protected]>
---
 arch/arm/mach-pxa/eseries.c |    6 +++
 sound/soc/pxa/e740_wm9705.c |   75 ++++++++++++++++++------------------------
 2 files changed, 38 insertions(+), 43 deletions(-)
arch/arm/mach-pxa/eseries.c +6 -0
index f79a610..b411779 100644
@@ -528,12 +528,18 @@ static struct platform_device e740_t7l66xb_device = {
 	.resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e740_audio_device = {
+	.name		= "e740-audio",
+	.id		= -1,
+};
+
 /* ----------------------------------------------------------------------- */
 
 static struct platform_device *e740_devices[] __initdata = {
 	&e740_fb_device,
 	&e740_t7l66xb_device,
 	&e7xx_gpio_vbus,
+	&e740_audio_device,
 };
 
 static void __init e740_init(void)
sound/soc/pxa/e740_wm9705.c +32 -43

98 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/5 ASoC: pxa: Convert e750_wm9705 to use snd_soc_register_card()

In reply to Axel Lin

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by Axel Lin <[email protected]>
---
 arch/arm/mach-pxa/eseries.c |    6 ++++
 sound/soc/pxa/e750_wm9705.c |   66 ++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 35 deletions(-)
arch/arm/mach-pxa/eseries.c +6 -0
index b411779..fe52d5c 100644
@@ -728,12 +728,18 @@ static struct platform_device e750_tc6393xb_device = {
 	.resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e750_audio_device = {
+	.name		= "e750-audio",
+	.id		= -1,
+};
+
 /* ------------------------------------------------------------- */
 
 static struct platform_device *e750_devices[] __initdata = {
 	&e750_fb_device,
 	&e750_tc6393xb_device,
 	&e7xx_gpio_vbus,
+	&e750_audio_device,
 };
 
 static void __init e750_init(void)
sound/soc/pxa/e750_wm9705.c +31 -35

89 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/5 ASoC: pxa: Convert e800_wm9712 to use snd_soc_register_card()

In reply to Axel Lin

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by Axel Lin <[email protected]>
---
 arch/arm/mach-pxa/eseries.c |    6 ++++
 sound/soc/pxa/e800_wm9712.c |   66 ++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 35 deletions(-)
arch/arm/mach-pxa/eseries.c +6 -0
index fe52d5c..4cb2391 100644
@@ -941,12 +941,18 @@ static struct platform_device e800_tc6393xb_device = {
 	.resource      = eseries_tmio_resources,
 };
 
+static struct platform_device e800_audio_device = {
+	.name		= "e800-audio",
+	.id		= -1,
+};
+
 /* ----------------------------------------------------------------------- */
 
 static struct platform_device *e800_devices[] __initdata = {
 	&e800_fb_device,
 	&e800_tc6393xb_device,
 	&e800_gpio_vbus,
+	&e800_audio_device,
 };
 
 static void __init e800_init(void)
sound/soc/pxa/e800_wm9712.c +31 -35

89 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/5 ASoC: pxa: Convert imote2 to use snd_soc_register_card()

In reply to Axel Lin

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by Axel Lin <[email protected]>
---
 arch/arm/mach-pxa/stargate2.c |    6 ++++++
 sound/soc/pxa/imote2.c        |   41 ++++++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 17 deletions(-)
arch/arm/mach-pxa/stargate2.c +6 -0
index d8a2467..b0656e15 100644
@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = {
 	.udc_command		= sg2_udc_command,
 };
 
+static struct platform_device imote2_audio_device = {
+	.name = "imote2-audio",
+	.id   = -1,
+};
+
 static struct platform_device *imote2_devices[] = {
 	&stargate2_flash_device,
 	&imote2_leds,
 	&sht15,
+	&imote2_audio_device,
 };
 
 static void __init imote2_init(void)
sound/soc/pxa/imote2.c +24 -17

63 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#5 lore raw

PATCH 5/5 ASoC: pxa: Convert tosa to use snd_soc_register_card()

In reply to Axel Lin

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by Axel Lin <[email protected]>
---
 arch/arm/mach-pxa/tosa.c |    6 +++
 sound/soc/pxa/tosa.c     |   77 ++++++++++++++++++----------------------------
 2 files changed, 36 insertions(+), 47 deletions(-)
arch/arm/mach-pxa/tosa.c +6 -0
index 7ce5c43..4d4eb60 100644
@@ -889,6 +889,11 @@ static struct platform_device wm9712_device = {
 	.id	= -1,
 };
 
+static struct platform_device tosa_audio_device = {
+	.name	= "tosa-audio",
+	.id	= -1,
+};
+
 static struct platform_device *devices[] __initdata = {
 	&tosascoop_device,
 	&tosascoop_jc_device,

@@ -901,6 +906,7 @@ static struct platform_device *devices[] __initdata = {
 	&sharpsl_rom_device,
 	&wm9712_device,
 	&tosa_gpio_vbus,
+	&tosa_audio_device,
 };
 
 static void tosa_poweroff(void)
sound/soc/pxa/tosa.c +30 -47

108 lines not on this page · raw message

Signature · 1 line
1.7.5.4
Applied
#6 lore raw
In reply to Axel Lin
Quoted 1 line · Axel Lin

This serial converts some pxa machine drivers to use use snd_soc_register_card().

Applied all, thanks.