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: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index b74df52d2820b7bc23f7d93e221a7a4dc4fa40e6..890b582b40f3af7d61363ca96604e7a4b6261a28 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3823,14 +3823,17 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                wm8994->hubs.no_cache_dac_hp_direct = true;
                wm8994->fll_byp = true;
 
-               switch (wm8994->revision) {
+               switch (control->cust_id) {
                case 0:
-               case 1:
                case 2:
-               case 3:
                        wm8994->hubs.dcs_codes_l = -9;
                        wm8994->hubs.dcs_codes_r = -7;
                        break;
+               case 1:
+               case 3:
+                       wm8994->hubs.dcs_codes_l = -8;
+                       wm8994->hubs.dcs_codes_r = -7;
+                       break;
                default:
                        break;
                }
@@ -3919,7 +3922,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
        switch (control->type) {
        case WM1811:
-               if (wm8994->revision > 1) {
+               if (control->cust_id > 1 || wm8994->revision > 1) {
                        ret = wm8994_request_irq(wm8994->wm8994,
                                                 WM8994_IRQ_GPIO(6),
                                                 wm1811_jackdet_irq, "JACKDET",