Merge branch 'fix/rt298' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/codecs/rt298.c
index d039c995c0512f90a1bbf79a00155adf876ea690,d3e30a645ae3055101267974de99e20296b28ba9..91a7ba3c1bf094745ef465fdc8484dad8fb276c4
--- 1/sound/soc/codecs/rt298.c
--- 2/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@@ -49,18 -49,18 +49,18 @@@ struct rt298_priv 
        int is_hp_in;
  };
  
 -static struct reg_default rt298_index_def[] = {
 +static const struct reg_default rt298_index_def[] = {
-       { 0x01, 0xaaaa },
-       { 0x02, 0x8aaa },
+       { 0x01, 0xa5a8 },
+       { 0x02, 0x8e95 },
        { 0x03, 0x0002 },
-       { 0x04, 0xaf01 },
-       { 0x08, 0x000d },
-       { 0x09, 0xd810 },
-       { 0x0a, 0x0120 },
+       { 0x04, 0xaf67 },
+       { 0x08, 0x200f },
+       { 0x09, 0xd010 },
+       { 0x0a, 0x0100 },
        { 0x0b, 0x0000 },
        { 0x0d, 0x2800 },
-       { 0x0f, 0x0000 },
-       { 0x19, 0x0a17 },
+       { 0x0f, 0x0022 },
+       { 0x19, 0x0217 },
        { 0x20, 0x0020 },
        { 0x33, 0x0208 },
        { 0x46, 0x0300 },