aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/davinci/davinci-evm.c32
1 files changed, 5 insertions, 27 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 0190c1bea4e3..67414f659405 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -206,57 +206,37 @@ static struct snd_soc_card da850_snd_soc_card = {
206 .num_links = 1, 206 .num_links = 1,
207}; 207};
208 208
209/* evm audio private data */ 209static struct aic3x_setup_data aic3x_setup;
210static struct aic3x_setup_data evm_aic3x_setup = {
211};
212
213/* dm6467 evm audio private data */
214static struct aic3x_setup_data dm6467_evm_aic3x_setup = {
215 .i2c_bus = 1,
216 .i2c_address = 0x18,
217};
218
219static struct aic3x_setup_data da8xx_evm_aic3x_setup = {
220 .i2c_bus = 1,
221 .i2c_address = 0x18,
222};
223 210
224/* evm audio subsystem */ 211/* evm audio subsystem */
225static struct snd_soc_device evm_snd_devdata = { 212static struct snd_soc_device evm_snd_devdata = {
226 .card = &snd_soc_card_evm, 213 .card = &snd_soc_card_evm,
227 .codec_dev = &soc_codec_dev_aic3x, 214 .codec_dev = &soc_codec_dev_aic3x,
228 .codec_data = &evm_aic3x_setup, 215 .codec_data = &aic3x_setup,
229}; 216};
230 217
231/* evm audio subsystem */ 218/* evm audio subsystem */
232static struct snd_soc_device dm6467_evm_snd_devdata = { 219static struct snd_soc_device dm6467_evm_snd_devdata = {
233 .card = &dm6467_snd_soc_card_evm, 220 .card = &dm6467_snd_soc_card_evm,
234 .codec_dev = &soc_codec_dev_aic3x, 221 .codec_dev = &soc_codec_dev_aic3x,
235 .codec_data = &dm6467_evm_aic3x_setup, 222 .codec_data = &aic3x_setup,
236}; 223};
237 224
238/* evm audio subsystem */ 225/* evm audio subsystem */
239static struct snd_soc_device da830_evm_snd_devdata = { 226static struct snd_soc_device da830_evm_snd_devdata = {
240 .card = &da830_snd_soc_card, 227 .card = &da830_snd_soc_card,
241 .codec_dev = &soc_codec_dev_aic3x, 228 .codec_dev = &soc_codec_dev_aic3x,
242 .codec_data = &da8xx_evm_aic3x_setup, 229 .codec_data = &aic3x_setup,
243}; 230};
244 231
245static struct snd_soc_device da850_evm_snd_devdata = { 232static struct snd_soc_device da850_evm_snd_devdata = {
246 .card = &da850_snd_soc_card, 233 .card = &da850_snd_soc_card,
247 .codec_dev = &soc_codec_dev_aic3x, 234 .codec_dev = &soc_codec_dev_aic3x,
248 .codec_data = &da8xx_evm_aic3x_setup, 235 .codec_data = &aic3x_setup,
249}; 236};
250 237
251static struct platform_device *evm_snd_device; 238static struct platform_device *evm_snd_device;
252 239
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
260static int __init evm_init(void) 240static int __init evm_init(void)
261{ 241{
262 struct snd_soc_device *evm_snd_dev_data; 242 struct snd_soc_device *evm_snd_dev_data;
@@ -281,8 +261,6 @@ static int __init evm_init(void)
281 } else 261 } else
282 return -EINVAL; 262 return -EINVAL;
283 263
284 i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
285
286 evm_snd_device = platform_device_alloc("soc-audio", index); 264 evm_snd_device = platform_device_alloc("soc-audio", index);
287 if (!evm_snd_device) 265 if (!evm_snd_device)
288 return -ENOMEM; 266 return -ENOMEM;