aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000
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/s6000
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/s6000')
-rw-r--r--sound/soc/s6000/s6105-ipcam.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c
index 082215d8787..c1b40ac22c0 100644
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.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>
@@ -209,10 +210,19 @@ static struct s6000_snd_platform_data __initdata s6105_snd_data = {
209 210
210static struct platform_device *s6105_snd_device; 211static struct platform_device *s6105_snd_device;
211 212
213/* temporary i2c device creation until this can be moved into the machine
214 * support file.
215*/
216static struct i2c_board_info i2c_device[] = {
217 { I2C_BOARD_INFO("tlv320aic33", 0x18), }
218};
219
212static int __init s6105_init(void) 220static int __init s6105_init(void)
213{ 221{
214 int ret; 222 int ret;
215 223
224 i2c_register_board_info(0, i2c_device, ARRAY_SIZE(i2c_device));
225
216 s6105_snd_device = platform_device_alloc("soc-audio", -1); 226 s6105_snd_device = platform_device_alloc("soc-audio", -1);
217 if (!s6105_snd_device) 227 if (!s6105_snd_device)
218 return -ENOMEM; 228 return -ENOMEM;