diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-21 18:30:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-21 18:30:55 +0000 |
| commit | 477adb06bf1638a4f108d155431ec0dd1ff8ba88 (patch) | |
| tree | a3c5d15f9a546eed34c585f0f2e78538e9ed1d4c /sound | |
| parent | c358e640a669b528b32af5442c92b856de623e1c (diff) | |
| parent | 20a4e7fc7e213365ea3771d7bf1e10a6bab853be (diff) | |
| download | linux-3.10-477adb06bf1638a4f108d155431ec0dd1ff8ba88.tar.gz linux-3.10-477adb06bf1638a4f108d155431ec0dd1ff8ba88.tar.bz2 linux-3.10-477adb06bf1638a4f108d155431ec0dd1ff8ba88.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 15 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-evm.c | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index c466982eed2..613df5db0b3 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) static void calibrate_dc_servo(struct snd_soc_codec *codec) { struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); + s8 offset; u16 reg, reg_l, reg_r, dcs_cfg; /* If we're using a digital only path and have a previously @@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) hubs->dcs_codes); /* HPOUT1L */ - if (reg_l + hubs->dcs_codes > 0 && - reg_l + hubs->dcs_codes < 0xff) - reg_l += hubs->dcs_codes; - dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT; + offset = reg_l; + offset += hubs->dcs_codes; + dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; /* HPOUT1R */ - if (reg_r + hubs->dcs_codes > 0 && - reg_r + hubs->dcs_codes < 0xff) - reg_r += hubs->dcs_codes; - dcs_cfg |= reg_r; + offset = reg_r; + offset += hubs->dcs_codes; + dcs_cfg |= (u8)offset; dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 0c2d6bacc68..b36f0b39b09 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { .stream_name = "AIC3X", .cpu_dai_name= "davinci-mcasp.0", .codec_dai_name = "tlv320aic3x-hifi", - .codec_name = "tlv320aic3x-codec.0-001a", + .codec_name = "tlv320aic3x-codec.1-0018", .platform_name = "davinci-pcm-audio", .init = evm_aic3x_init, .ops = &evm_ops, |