diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:06 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:06 +0000 |
| commit | 6c97857b0184da9f83d3b25b8d9a23e8b0c7d1de (patch) | |
| tree | 1853e23ac7d9583b0a623931e061a2392dcd667c /sound/soc | |
| parent | 593c39e08a0626263fe468737e02d92aab85d46b (diff) | |
tracking-2.6.28-add-codec_dev-to-gta02-soc-mach-stuff.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 2 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 4706b87d3f1..8ede5bd66c1 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1829,7 +1829,7 @@ static int wm8753_probe(struct platform_device *pdev) #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); } diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 030bab3b693..7dd1983a885 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -604,12 +604,23 @@ static struct snd_soc_machine neo1973_gta02 = { .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, + .codec_data = &soc_codec_data_wm8753_gta02, }; + + static struct platform_device *neo1973_gta02_snd_device; static int __init neo1973_gta02_init(void) |