tracking-2.6.28-add-codec_dev-to-gta02-soc-mach-stuff.patch
authorAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:06 +0000 (17:11 +0000)
committerAndy Green <andy@openmoko.com>
Wed, 19 Nov 2008 17:11:06 +0000 (17:11 +0000)
Signed-off-by: Andy Green <andy@openmoko.com>
sound/soc/codecs/wm8753.c
sound/soc/s3c24xx/neo1973_gta02_wm8753.c

index 4706b87..8ede5bd 100644 (file)
@@ -1829,7 +1829,7 @@ static int wm8753_probe(struct platform_device *pdev)
 #endif
 
        if (ret != 0) {
 #endif
 
        if (ret != 0) {
-               printk(KERN_ERR "can't add coded bus driver");
+               printk(KERN_ERR "can't add codec bus driver\n");
                kfree(codec->private_data);
                kfree(codec);
        }
                kfree(codec->private_data);
                kfree(codec);
        }
index 030bab3..7dd1983 100644 (file)
@@ -604,12 +604,23 @@ static struct snd_soc_machine neo1973_gta02 = {
        .num_links = ARRAY_SIZE(neo1973_gta02_dai),
 };
 
        .num_links = ARRAY_SIZE(neo1973_gta02_dai),
 };
 
+/* Audio private data */
+static struct wm8753_setup_data soc_codec_data_wm8753_gta02 = {
+       .i2c_bus = 0,
+       .i2c_address = 0x1a,
+//     .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
+//     .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
+};
+
 static struct snd_soc_device neo1973_gta02_snd_devdata = {
        .machine = &neo1973_gta02,
        .platform = &s3c24xx_soc_platform,
        .codec_dev = &soc_codec_dev_wm8753,
 static struct snd_soc_device neo1973_gta02_snd_devdata = {
        .machine = &neo1973_gta02,
        .platform = &s3c24xx_soc_platform,
        .codec_dev = &soc_codec_dev_wm8753,
+       .codec_data = &soc_codec_data_wm8753_gta02,
 };
 
 };
 
+
+
 static struct platform_device *neo1973_gta02_snd_device;
 
 static int __init neo1973_gta02_init(void)
 static struct platform_device *neo1973_gta02_snd_device;
 
 static int __init neo1973_gta02_init(void)