From: Mark Brown <broonie@kernel.org>
Date: Fri, 16 Oct 2015 17:17:31 +0000 (+0100)
Subject: Merge branch 'fix/rt298' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.4-rc1~92^2~3^2~11^2~3^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3db7cb951835d6226d47e979bca7cacbbb8f9f1c;p=linux.git

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

3db7cb951835d6226d47e979bca7cacbbb8f9f1c
diff --cc sound/soc/codecs/rt298.c
index d039c995c051,d3e30a645ae3..91a7ba3c1bf0
--- a/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 },