diff options
Diffstat (limited to 'sound/soc/s6000/s6105-ipcam.c')
-rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index b5f95f9781c1..c1b40ac22c05 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> |
@@ -189,8 +190,6 @@ static struct snd_soc_card snd_soc_card_s6105 = { | |||
189 | 190 | ||
190 | /* s6105 audio private data */ | 191 | /* s6105 audio private data */ |
191 | static struct aic3x_setup_data s6105_aic3x_setup = { | 192 | static struct aic3x_setup_data s6105_aic3x_setup = { |
192 | .i2c_bus = 0, | ||
193 | .i2c_address = 0x18, | ||
194 | }; | 193 | }; |
195 | 194 | ||
196 | /* s6105 audio subsystem */ | 195 | /* s6105 audio subsystem */ |
@@ -211,10 +210,19 @@ static struct s6000_snd_platform_data __initdata s6105_snd_data = { | |||
211 | 210 | ||
212 | static struct platform_device *s6105_snd_device; | 211 | static struct platform_device *s6105_snd_device; |
213 | 212 | ||
213 | /* temporary i2c device creation until this can be moved into the machine | ||
214 | * support file. | ||
215 | */ | ||
216 | static struct i2c_board_info i2c_device[] = { | ||
217 | { I2C_BOARD_INFO("tlv320aic33", 0x18), } | ||
218 | }; | ||
219 | |||
214 | static int __init s6105_init(void) | 220 | static int __init s6105_init(void) |
215 | { | 221 | { |
216 | int ret; | 222 | int ret; |
217 | 223 | ||
224 | i2c_register_board_info(0, i2c_device, ARRAY_SIZE(i2c_device)); | ||
225 | |||
218 | s6105_snd_device = platform_device_alloc("soc-audio", -1); | 226 | s6105_snd_device = platform_device_alloc("soc-audio", -1); |
219 | if (!s6105_snd_device) | 227 | if (!s6105_snd_device) |
220 | return -ENOMEM; | 228 | return -ENOMEM; |