From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 16 Sep 2010 08:19:07 +0000 (+0200)
Subject: Merge branch 'fix/hda' into for-next
X-Git-Tag: next-20110726~34^2~477
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46bbc2fbfb809badf9a4d18e28438393121635cd;p=karo-tx-linux.git

Merge branch 'fix/hda' into for-next
---

46bbc2fbfb809badf9a4d18e28438393121635cd
diff --cc sound/pci/hda/patch_realtek.c
index ab2947d87232,a1312a6c8af2..2063d0f75898
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -14607,79 -14451,28 +14607,88 @@@ static void alc269_auto_init(struct hda
  		alc_inithook(codec);
  }
  
 +#ifdef CONFIG_SND_HDA_POWER_SAVE
 +static int alc269_suspend(struct hda_codec *codec, pm_message_t state)
 +{
 +	struct alc_spec *spec = codec->spec;
 +	int val;
 +
 +	if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x017) {
 +		val = alc_read_coef_idx(codec, 0x04);
 +		/* Power down output pin */
 +		alc_write_coef_idx(codec, 0x04, val & ~(1<<11));
 +	}
 +
 +	if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
 +		val = alc_read_coef_idx(codec, 0x04);
 +		/* Power down output pin */
 +		alc_write_coef_idx(codec, 0x04, val & ~(1<<11));
 +		msleep(150);
 +	}
 +
 +	alc_shutup(codec);
 +	if (spec && spec->power_hook)
 +		spec->power_hook(codec);
 +	return 0;
 +}
 +#endif
 +#ifdef SND_HDA_NEEDS_RESUME
 +static int alc269_resume(struct hda_codec *codec)
 +{
 +	int val;
 +
 +	if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
 +		val = alc_read_coef_idx(codec, 0x04);
 +		/* Power down output pin */
 +		alc_write_coef_idx(codec, 0x04, val & ~(1<<11));
 +		msleep(150);
 +	}
 +
 +	codec->patch_ops.init(codec);
 +
 +	if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x017) {
 +		val = alc_read_coef_idx(codec, 0x04);
 +		/* Power up output pin */
 +		alc_write_coef_idx(codec, 0x04, val | (1<<11));
 +		msleep(200);
 +	}
 +
 +	if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
 +		val = alc_read_coef_idx(codec, 0x04);
 +		/* Power up output pin */
 +		alc_write_coef_idx(codec, 0x04, val | (1<<11));
 +	}
 +
 +	snd_hda_codec_resume_amp(codec);
 +	snd_hda_codec_resume_cache(codec);
 +#ifdef CONFIG_SND_HDA_POWER_SAVE
 +	if (codec->patch_ops.check_power_status)
 +		codec->patch_ops.check_power_status(codec, 0x01);
 +#endif
 +	return 0;
 +}
 +#endif
 +
  enum {
  	ALC269_FIXUP_SONY_VAIO,
+ 	ALC269_FIXUP_DELL_M101Z,
  };
  
 -static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
 -	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
 -	{}
 -};
 -
  static const struct alc_fixup alc269_fixups[] = {
  	[ALC269_FIXUP_SONY_VAIO] = {
 -		.verbs = alc269_sony_vaio_fixup_verbs
 +		.verbs = (const struct hda_verb[]) {
 +			{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
 +			{}
 +		}
  	},
+ 	[ALC269_FIXUP_DELL_M101Z] = {
+ 		.verbs = (const struct hda_verb[]) {
+ 			/* Enables internal speaker */
+ 			{0x20, AC_VERB_SET_COEF_INDEX, 13},
+ 			{0x20, AC_VERB_SET_PROC_COEF, 0x4040},
+ 			{}
+ 		}
+ 	},
  };
  
  static struct snd_pci_quirk alc269_fixup_tbl[] = {