Skip to contentSkip to conversation

ASoC: Convert kirkwood-t5325 to use snd_soc_register_card()

PATCH Applied Axel Lin 2 participants 3 messages Dec 28, 2011 – Feb 7, 2012

Subsystems (4)
Arm (32-bit) Sound Arm sub-architectures ASoC
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 ASoC: Convert kirkwood-t5325 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]>

---
I don't have this hardware, I'd appreciate if someone can test this patch. Axel

 arch/arm/mach-kirkwood/t5325-setup.c |    6 ++++
 sound/soc/kirkwood/kirkwood-t5325.c  |   47 +++++++++++++++++----------------
 2 files changed, 30 insertions(+), 23 deletions(-)
arch/arm/mach-kirkwood/t5325-setup.c +6 -0
index 966b2b3..f9d2a11 100644
@@ -106,6 +106,11 @@ static struct platform_device hp_t5325_button_device = {
 	}
 };
 
+static struct platform_device hp_t5325_audio_device = {
+	.name		= "t5325-audio",
+	.id		= -1,
+};
+
 static unsigned int hp_t5325_mpp_config[] __initdata = {
 	MPP0_NF_IO2,
 	MPP1_SPI_MOSI,

@@ -179,6 +184,7 @@ static void __init hp_t5325_init(void)
 	kirkwood_sata_init(&hp_t5325_sata_data);
 	kirkwood_ehci_init();
 	platform_device_register(&hp_t5325_button_device);
+	platform_device_register(&hp_t5325_audio_device);
 
 	i2c_register_board_info(0, i2c_board_info, ARRAY_SIZE(i2c_board_info));
 	kirkwood_audio_init();
sound/soc/kirkwood/kirkwood-t5325.c +24 -23

69 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 ASoC: Convert kirkwood-openrd 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]>

---
I don't have this hardware, I'd appreciate if someone can test this patch. Axel

 arch/arm/mach-kirkwood/openrd-setup.c |    6 ++++
 sound/soc/kirkwood/kirkwood-openrd.c  |   46 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 23 deletions(-)
arch/arm/mach-kirkwood/openrd-setup.c +6 -0
index 01f8c89..7e99c3f 100644
@@ -83,6 +83,11 @@ static struct i2c_board_info i2c_board_info[] __initdata = {
 	},
 };
 
+static struct platform_device openrd_client_audio_device = {
+	.name		= "openrd-client-audio",
+	.id		= -1,
+};
+
 static int __initdata uart1;
 
 static int __init sd_uart_selection(char *str)

@@ -172,6 +177,7 @@ static void __init openrd_init(void)
 	kirkwood_i2c_init();
 
 	if (machine_is_openrd_client() || machine_is_openrd_ultimate()) {
+		platform_device_register(&openrd_client_audio_device);
 		i2c_register_board_info(0, i2c_board_info,
 			ARRAY_SIZE(i2c_board_info));
 		kirkwood_audio_init();
sound/soc/kirkwood/kirkwood-openrd.c +23 -23

64 lines not on this page · raw message

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

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

Applied both, thanks.