diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:21 -0400 |
commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /sound/soc/codecs/da9055.c | |
parent | 8b3272bffe58682de568e36f9db52495f9b9d0f2 (diff) | |
parent | a32c17b87c17f5e2e68edcf4d163ee42f9490652 (diff) |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'sound/soc/codecs/da9055.c')
-rw-r--r-- | sound/soc/codecs/da9055.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index f118daa91234..4ff06b50fbba 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c | |||
@@ -1383,16 +1383,8 @@ static int da9055_set_bias_level(struct snd_soc_codec *codec, | |||
1383 | 1383 | ||
1384 | static int da9055_probe(struct snd_soc_codec *codec) | 1384 | static int da9055_probe(struct snd_soc_codec *codec) |
1385 | { | 1385 | { |
1386 | int ret; | ||
1387 | struct da9055_priv *da9055 = snd_soc_codec_get_drvdata(codec); | 1386 | struct da9055_priv *da9055 = snd_soc_codec_get_drvdata(codec); |
1388 | 1387 | ||
1389 | codec->control_data = da9055->regmap; | ||
1390 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); | ||
1391 | if (ret < 0) { | ||
1392 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
1393 | return ret; | ||
1394 | } | ||
1395 | |||
1396 | /* Enable all Gain Ramps */ | 1388 | /* Enable all Gain Ramps */ |
1397 | snd_soc_update_bits(codec, DA9055_AUX_L_CTRL, | 1389 | snd_soc_update_bits(codec, DA9055_AUX_L_CTRL, |
1398 | DA9055_GAIN_RAMPING_EN, DA9055_GAIN_RAMPING_EN); | 1390 | DA9055_GAIN_RAMPING_EN, DA9055_GAIN_RAMPING_EN); |