From: Mark Brown <broonie@kernel.org>
Date: Mon, 26 Oct 2015 02:16:13 +0000 (+0900)
Subject: Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic... 
X-Git-Tag: firefly_0821_release~176^2~581^2~9^2^4~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=71831ef6991138fa01fa3cc8e253b03e545e5af6

Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/samsung' and 'asoc/topic/sh' into asoc-next
---

71831ef6991138fa01fa3cc8e253b03e545e5af6
diff --cc sound/soc/codecs/rt298.c
index 603e9334b971,91a7ba3c1bf0,3c2f0f8d6266,3c2f0f8d6266,3c2f0f8d6266..b3f795c60749
--- a/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 },