[Gta04-owner] [PATCH] gta04-voice: fix gtm601 registration order

John Ogness gta04 at ogness.net
Mon Sep 5 20:44:46 CEST 2011


The gtm601 driver expects that it has already been linked
into the audio-soc framework when its probe function is
called.

Signed-off-by: John Ogness <john.ogness at linutronix.de>
---

With this patch, the gtm601 codec is bound to an ALSA
device.

 arch/arm/mach-omap2/board-omap3gta04.c |   15 ---------------
 sound/soc/omap/gta04-voice.c           |    7 +++++++
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c
index 4775397..2abe5c8 100644
--- a/arch/arm/mach-omap2/board-omap3gta04.c
+++ b/arch/arm/mach-omap2/board-omap3gta04.c
@@ -679,18 +679,6 @@ static struct i2c_board_info __initdata gta04_i2c1_boardinfo[] = {
 	},
 };
 
-	
-#if defined(CONFIG_SND_SOC_GTM601)
-
-static struct platform_device gta04_gtm601_codec_audio_device = {
-	.name	= "gtm601_codec_audio",
-	.id	= -1,
-	.dev	= {
-		.platform_data	= NULL,
-	},
-};
-#endif
-
 #if defined(CONFIG_SND_SOC_SI47XX)
 
 static struct platform_device gta04_si47xx_codec_audio_device = {
@@ -1002,9 +990,6 @@ static struct platform_device *gta04_devices[] __initdata = {
 #if defined(CONFIG_HDQ_MASTER_OMAP)
 	&gta04_hdq_device,
 #endif
-#if defined(CONFIG_SND_SOC_GTM601)
-	&gta04_gtm601_codec_audio_device,
-#endif
 #if FIXME
 	gta04_si47xx_codec_audio_device,
 	gta04_w2cbw003_codec_audio_device,
diff --git a/sound/soc/omap/gta04-voice.c b/sound/soc/omap/gta04-voice.c
index 5646cc1..a9edfa3 100644
--- a/sound/soc/omap/gta04-voice.c
+++ b/sound/soc/omap/gta04-voice.c
@@ -86,6 +86,11 @@ static struct snd_soc_device gta04_voice_devdata = {
 
 static struct platform_device *gta04_voice_snd_device;
 
+static struct platform_device gta04_gtm601_codec_audio_device = {
+	.name	= "gtm601_codec_audio",
+	.id	= -1,
+};
+
 static int __init gta04_voice_soc_init(void)
 {
 	struct device *dev;
@@ -111,6 +116,8 @@ static int __init gta04_voice_soc_init(void)
 		platform_device_put(gta04_voice_snd_device);
 	}
 
+	platform_device_register(&gta04_gtm601_codec_audio_device);
+
 	return ret;
 }
 
-- 
1.7.2.5


More information about the Gta04-owner mailing list