aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-14 15:18:49 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-14 15:18:49 -0400
commita6f096f3b6effff9edc0f34a20eb0593406cc00a (patch)
tree78038e9bb7d52b4fc8920ce0ee5c0dd345ee4a7f /sound
parentbc6ae96a445fe527e32695135130ce4bd24b90d2 (diff)
ASoC: Convert DA7210 to table based DAPM init
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/da7210.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index ff682472c640..3b5dc0d38dbb 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -528,9 +528,6 @@ static int da7210_probe(struct snd_soc_codec *codec)
528 /* Activate all enabled subsystem */ 528 /* Activate all enabled subsystem */
529 snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); 529 snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN);
530 530
531 snd_soc_add_controls(codec, da7210_snd_controls,
532 ARRAY_SIZE(da7210_snd_controls));
533
534 dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); 531 dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
535 532
536 return 0; 533 return 0;
@@ -542,6 +539,9 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
542 .reg_word_size = sizeof(u8), 539 .reg_word_size = sizeof(u8),
543 .reg_cache_default = da7210_reg, 540 .reg_cache_default = da7210_reg,
544 .volatile_register = da7210_volatile_register, 541 .volatile_register = da7210_volatile_register,
542
543 .controls = da7210_snd_controls,
544 .num_controls = ARRAY_SIZE(da7210_snd_controls),
545}; 545};
546 546
547#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 547#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)