aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2009-08-20 17:50:42 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-21 05:52:57 -0400
commitaa6b904e66d5f484bd52763d63259b9a16f6e107 (patch)
treec05d8c9637436001f60a6d447cfae0880f6f5623 /sound/soc/davinci
parentcb3826f524728a90a47f2f831c3d61851c8091b2 (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/davinci')
-rw-r--r--sound/soc/davinci/davinci-evm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 396d777dedac..0190c1bea4e3 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -14,6 +14,7 @@
14#include <linux/timer.h> 14#include <linux/timer.h>
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/i2c.h>
17#include <sound/core.h> 18#include <sound/core.h>
18#include <sound/pcm.h> 19#include <sound/pcm.h>
19#include <sound/soc.h> 20#include <sound/soc.h>
@@ -249,6 +250,13 @@ static struct snd_soc_device da850_evm_snd_devdata = {
249 250
250static struct platform_device *evm_snd_device; 251static struct platform_device *evm_snd_device;
251 252
253/* temporary i2c device creation until this can be moved into the machine
254 * support file.
255*/
256static struct i2c_board_info i2c_device[] = {
257 { I2C_BOARD_INFO("tlv320aic33", 0x1b), }
258};
259
252static int __init evm_init(void) 260static int __init evm_init(void)
253{ 261{
254 struct snd_soc_device *evm_snd_dev_data; 262 struct snd_soc_device *evm_snd_dev_data;
@@ -273,6 +281,8 @@ static int __init evm_init(void)
273 } else 281 } else
274 return -EINVAL; 282 return -EINVAL;
275 283
284 i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
285
276 evm_snd_device = platform_device_alloc("soc-audio", index); 286 evm_snd_device = platform_device_alloc("soc-audio", index);
277 if (!evm_snd_device) 287 if (!evm_snd_device)
278 return -ENOMEM; 288 return -ENOMEM;