diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-08-20 17:50:42 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-21 05:52:57 -0400 |
commit | aa6b904e66d5f484bd52763d63259b9a16f6e107 (patch) | |
tree | c05d8c9637436001f60a6d447cfae0880f6f5623 /sound/soc/omap/n810.c | |
parent | cb3826f524728a90a47f2f831c3d61851c8091b2 (diff) |
ASoC: tlv320aic3x: fixup board device changes
Fixup the device changes by modifying the files that we just removed the
explicit device creation from with i2c_register_board_info() until this
can be moved into the relevant board files.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/n810.c')
-rw-r--r-- | sound/soc/omap/n810.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 4d3aec2a9f2a..0a505938e42b 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
@@ -22,6 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | #include <linux/i2c.h> | ||
25 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
26 | #include <sound/core.h> | 27 | #include <sound/core.h> |
27 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
@@ -335,6 +336,13 @@ static struct snd_soc_device n810_snd_devdata = { | |||
335 | 336 | ||
336 | static struct platform_device *n810_snd_device; | 337 | static struct platform_device *n810_snd_device; |
337 | 338 | ||
339 | /* temporary i2c device creation until this can be moved into the machine | ||
340 | * support file. | ||
341 | */ | ||
342 | static struct i2c_board_info i2c_device[] = { | ||
343 | { I2C_BOARD_INFO("tlv320aic3x", 0x1b), } | ||
344 | }; | ||
345 | |||
338 | static int __init n810_soc_init(void) | 346 | static int __init n810_soc_init(void) |
339 | { | 347 | { |
340 | int err; | 348 | int err; |
@@ -343,6 +351,8 @@ static int __init n810_soc_init(void) | |||
343 | if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) | 351 | if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) |
344 | return -ENODEV; | 352 | return -ENODEV; |
345 | 353 | ||
354 | i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device)); | ||
355 | |||
346 | n810_snd_device = platform_device_alloc("soc-audio", -1); | 356 | n810_snd_device = platform_device_alloc("soc-audio", -1); |
347 | if (!n810_snd_device) | 357 | if (!n810_snd_device) |
348 | return -ENOMEM; | 358 | return -ENOMEM; |