Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic...

diff --cc sound/soc/codecs/rt298.c
index 603e9334b971349ea6e98ee6e1115167abb45358,91a7ba3c1bf094745ef465fdc8484dad8fb276c4,3c2f0f8d6266e358a667aa376fea3d094829845a,3c2f0f8d6266e358a667aa376fea3d094829845a,3c2f0f8d6266e358a667aa376fea3d094829845a..b3f795c60749b8f8473184f0872329d4578b8e48
--- 1/sound/soc/codecs/rt298.c
--- 2/sound/soc/codecs/rt298.c
--- 3/sound/soc/codecs/rt298.c
--- 4/sound/soc/codecs/rt298.c
--- 5/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@@@@@ -48,18 -49,18 -49,18 -49,18 -49,18 +48,18 @@@@@@ struct rt298_priv 
        int is_hp_in;
     };
     
- ---static struct reg_default rt298_index_def[] = {
  ---   { 0x01, 0xaaaa },
  ---   { 0x02, 0x8aaa },
+ +++static const struct reg_default rt298_index_def[] = {
  +++   { 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 },

diff --cc sound/soc/sh/Kconfig
Simple merge