Commit 4537c4e7 authored by Mark Brown's avatar Mark Brown

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 79ef0abc
...@@ -1433,7 +1433,8 @@ static int wm8993_probe(struct snd_soc_codec *codec) ...@@ -1433,7 +1433,8 @@ static int wm8993_probe(struct snd_soc_codec *codec)
int ret, i, val; int ret, i, val;
wm8993->hubs_data.hp_startup_mode = 1; wm8993->hubs_data.hp_startup_mode = 1;
wm8993->hubs_data.dcs_codes = -2; wm8993->hubs_data.dcs_codes_l = -2;
wm8993->hubs_data.dcs_codes_r = -2;
wm8993->hubs_data.series_startup = 1; wm8993->hubs_data.series_startup = 1;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
......
...@@ -2973,7 +2973,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -2973,7 +2973,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
switch (wm8994->revision) { switch (wm8994->revision) {
case 2: case 2:
case 3: case 3:
wm8994->hubs.dcs_codes = -5; wm8994->hubs.dcs_codes_l = -5;
wm8994->hubs.dcs_codes_r = -5;
wm8994->hubs.hp_startup_mode = 1; wm8994->hubs.hp_startup_mode = 1;
wm8994->hubs.dcs_readback_mode = 1; wm8994->hubs.dcs_readback_mode = 1;
wm8994->hubs.series_startup = 1; wm8994->hubs.series_startup = 1;
......
...@@ -179,18 +179,19 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) ...@@ -179,18 +179,19 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r); dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);
/* Apply correction to DC servo result */ /* Apply correction to DC servo result */
if (hubs->dcs_codes) { if (hubs->dcs_codes_l || hubs->dcs_codes_r) {
dev_dbg(codec->dev, "Applying %d code DC servo correction\n", dev_dbg(codec->dev,
hubs->dcs_codes); "Applying %d/%d code DC servo correction\n",
hubs->dcs_codes_l, hubs->dcs_codes_r);
/* HPOUT1R */ /* HPOUT1R */
offset = reg_r; offset = reg_r;
offset += hubs->dcs_codes; offset += hubs->dcs_codes_r;
dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
/* HPOUT1L */ /* HPOUT1L */
offset = reg_l; offset = reg_l;
offset += hubs->dcs_codes; offset += hubs->dcs_codes_l;
dcs_cfg |= (u8)offset; dcs_cfg |= (u8)offset;
dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); 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,7 +229,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
/* If we're applying an offset correction then updating the /* If we're applying an offset correction then updating the
* callibration would be likely to introduce further offsets. */ * callibration would be likely to introduce further offsets. */
if (hubs->dcs_codes || hubs->no_series_update) if (hubs->dcs_codes_l || hubs->dcs_codes_r || hubs->no_series_update)
return ret; return ret;
/* Only need to do this if the outputs are active */ /* Only need to do this if the outputs are active */
......
...@@ -23,7 +23,8 @@ extern const unsigned int wm_hubs_spkmix_tlv[]; ...@@ -23,7 +23,8 @@ extern const unsigned int wm_hubs_spkmix_tlv[];
/* This *must* be the first element of the codec->private_data struct */ /* This *must* be the first element of the codec->private_data struct */
struct wm_hubs_data { struct wm_hubs_data {
int dcs_codes; int dcs_codes_l;
int dcs_codes_r;
int dcs_readback_mode; int dcs_readback_mode;
int hp_startup_mode; int hp_startup_mode;
int series_startup; int series_startup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment