Commit 52ca1138 authored by Mark Brown's avatar Mark Brown

ASoC: wm8994: Update for new WM1811 variants

There are some new WM1811 variants distinguished by both revision and
cust_id which need slightly different handling.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7ccf6124
...@@ -3823,14 +3823,17 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -3823,14 +3823,17 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994->hubs.no_cache_dac_hp_direct = true; wm8994->hubs.no_cache_dac_hp_direct = true;
wm8994->fll_byp = true; wm8994->fll_byp = true;
switch (wm8994->revision) { switch (control->cust_id) {
case 0: case 0:
case 1:
case 2: case 2:
case 3:
wm8994->hubs.dcs_codes_l = -9; wm8994->hubs.dcs_codes_l = -9;
wm8994->hubs.dcs_codes_r = -7; wm8994->hubs.dcs_codes_r = -7;
break; break;
case 1:
case 3:
wm8994->hubs.dcs_codes_l = -8;
wm8994->hubs.dcs_codes_r = -7;
break;
default: default:
break; break;
} }
...@@ -3919,7 +3922,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -3919,7 +3922,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
switch (control->type) { switch (control->type) {
case WM1811: case WM1811:
if (wm8994->revision > 1) { if (control->cust_id > 1 || wm8994->revision > 1) {
ret = wm8994_request_irq(wm8994->wm8994, ret = wm8994_request_irq(wm8994->wm8994,
WM8994_IRQ_GPIO(6), WM8994_IRQ_GPIO(6),
wm1811_jackdet_irq, "JACKDET", wm1811_jackdet_irq, "JACKDET",
......
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