From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 8 Apr 2015 09:29:56 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a599838737a2527c35e4d94f794aefe59df1781;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' into for-next

Back merge HD-audio quirks to for-next branch, so that we can apply
a couple of more quirks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

0a599838737a2527c35e4d94f794aefe59df1781
diff --cc sound/pci/hda/patch_realtek.c
index e0c06f9a0e80,a07da0bbb2b4..7f46d063af57
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -3562,8 -3607,9 +3564,9 @@@ static void alc_headset_mode_unplugged(
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_process_coef_fw(codec, coef0255);
  		break;
  	case 0x10ec0233:
@@@ -3617,8 -3663,9 +3620,9 @@@ static void alc_headset_mode_mic_in(str
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_write_coef_idx(codec, 0x45, 0xc489);
  		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
  		alc_process_coef_fw(codec, coef0255);
@@@ -3686,8 -3733,9 +3690,9 @@@ static void alc_headset_mode_default(st
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_process_coef_fw(codec, coef0255);
  		break;
  	case 0x10ec0233:
@@@ -3740,8 -3788,9 +3745,9 @@@ static void alc_headset_mode_ctia(struc
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_process_coef_fw(codec, coef0255);
  		break;
  	case 0x10ec0233:
@@@ -3794,8 -3843,9 +3800,9 @@@ static void alc_headset_mode_omtp(struc
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_process_coef_fw(codec, coef0255);
  		break;
  	case 0x10ec0233:
@@@ -3839,8 -3889,9 +3846,9 @@@ static void alc_determine_headset_type(
  		{}
  	};
  
 -	switch (codec->vendor_id) {
 +	switch (codec->core.vendor_id) {
  	case 0x10ec0255:
+ 	case 0x10ec0256:
  		alc_process_coef_fw(codec, coef0255);
  		msleep(300);
  		val = alc_read_coef_idx(codec, 0x46);