aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm_hubs.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-01 00:10:16 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-01 09:14:49 -0400
commit4537c4e7618d05c77e9f8c5259c977f927a37e2f (patch)
tree77db5f2e919cace15a8f8d3f0043bf8310fb989c /sound/soc/codecs/wm_hubs.c
parent79ef0abcd85842bc12ffb3297b958565f060464c (diff)
ASoC: Support separate left and right channel dcs_codes values
Some devices can have performance optimized by setting different offsets for left and right channels. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
-rw-r--r--sound/soc/codecs/wm_hubs.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 84a84f4eed95..26e21d01e137 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -179,18 +179,19 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
179 dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r); 179 dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);
180 180
181 /* Apply correction to DC servo result */ 181 /* Apply correction to DC servo result */
182 if (hubs->dcs_codes) { 182 if (hubs->dcs_codes_l || hubs->dcs_codes_r) {
183 dev_dbg(codec->dev, "Applying %d code DC servo correction\n", 183 dev_dbg(codec->dev,
184 hubs->dcs_codes); 184 "Applying %d/%d code DC servo correction\n",
185 hubs->dcs_codes_l, hubs->dcs_codes_r);
185 186
186 /* HPOUT1R */ 187 /* HPOUT1R */
187 offset = reg_r; 188 offset = reg_r;
188 offset += hubs->dcs_codes; 189 offset += hubs->dcs_codes_r;
189 dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; 190 dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
190 191
191 /* HPOUT1L */ 192 /* HPOUT1L */
192 offset = reg_l; 193 offset = reg_l;
193 offset += hubs->dcs_codes; 194 offset += hubs->dcs_codes_l;
194 dcs_cfg |= (u8)offset; 195 dcs_cfg |= (u8)offset;
195 196
196 dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); 197 dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg);
@@ -228,7 +229,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
228 229
229 /* If we're applying an offset correction then updating the 230 /* If we're applying an offset correction then updating the
230 * callibration would be likely to introduce further offsets. */ 231 * callibration would be likely to introduce further offsets. */
231 if (hubs->dcs_codes || hubs->no_series_update) 232 if (hubs->dcs_codes_l || hubs->dcs_codes_r || hubs->no_series_update)
232 return ret; 233 return ret;
233 234
234 /* Only need to do this if the outputs are active */ 235 /* Only need to do this if the outputs are active */