From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 21 Nov 2008 07:27:04 +0000 (+0100)
Subject: Merge branch 'topic/fix/hda' into topic/hda
X-Git-Tag: v2.6.29-rc1~590^2~6^2~68
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75a287d9a35a825cb758d2f8d8df93d41f9f8e3e;p=linux-2.6-omap-h63xx.git

Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_sigmatel.c
---

75a287d9a35a825cb758d2f8d8df93d41f9f8e3e
diff --cc sound/pci/hda/patch_sigmatel.c
index c346c77e306,9047dc76b00..a501c912164
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -4753,14 -4582,21 +4764,21 @@@ again
  
  	switch (spec->board_config) {
  	case STAC_HP_M4:
- 		spec->num_dmics = 0;
- 		spec->num_smuxes = 0;
- 		spec->num_dmuxes = 0;
- 
  		/* enable internal microphone */
 -		stac92xx_set_config_reg(codec, 0x0e, 0x01813040);
 +		stac_change_pin_config(codec, 0x0e, 0x01813040);
  		stac92xx_auto_set_pinctl(codec, 0x0e,
  			AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);
+ 		/* fallthru */
+ 	case STAC_DELL_M4_2:
+ 		spec->num_dmics = 0;
+ 		spec->num_smuxes = 0;
+ 		spec->num_dmuxes = 0;
+ 		break;
+ 	case STAC_DELL_M4_1:
+ 	case STAC_DELL_M4_3:
+ 		spec->num_dmics = 1;
+ 		spec->num_smuxes = 0;
+ 		spec->num_dmuxes = 0;
  		break;
  	default:
  		spec->num_dmics = STAC92HD71BXX_NUM_DMICS;