aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-28 08:17:17 -0400
committerTakashi Iwai <tiwai@suse.de>2011-06-29 02:02:21 -0400
commitc82693db52beced0419cecf09a3c81adfe95a544 (patch)
tree795feabaabbba5f879c1552d48d089ef42cd56f9 /sound/pci/hda/patch_conexant.c
parentc2549312d24d342432f8f55a73c98a44d9ab131d (diff)
ALSA: hda - Enable auto-parser as default for Conexant codecs
Let's use auto-parser as default now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r--sound/pci/hda/patch_conexant.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 6e90b6b526bc..4ca880bb68fa 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1124,10 +1124,8 @@ static int patch_cxt5045(struct hda_codec *codec)
1124 board_config = snd_hda_check_board_config(codec, CXT5045_MODELS, 1124 board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
1125 cxt5045_models, 1125 cxt5045_models,
1126 cxt5045_cfg_tbl); 1126 cxt5045_cfg_tbl);
1127#if 0 /* use the old method just for safety */
1128 if (board_config < 0) 1127 if (board_config < 0)
1129 board_config = CXT5045_AUTO; 1128 board_config = CXT5045_AUTO; /* model=auto as default */
1130#endif
1131 if (board_config == CXT5045_AUTO) 1129 if (board_config == CXT5045_AUTO)
1132 return patch_conexant_auto(codec); 1130 return patch_conexant_auto(codec);
1133 1131
@@ -1565,10 +1563,8 @@ static int patch_cxt5047(struct hda_codec *codec)
1565 board_config = snd_hda_check_board_config(codec, CXT5047_MODELS, 1563 board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,
1566 cxt5047_models, 1564 cxt5047_models,
1567 cxt5047_cfg_tbl); 1565 cxt5047_cfg_tbl);
1568#if 0 /* not enabled as default, as BIOS often broken for this codec */
1569 if (board_config < 0) 1566 if (board_config < 0)
1570 board_config = CXT5047_AUTO; 1567 board_config = CXT5047_AUTO; /* model=auto as default */
1571#endif
1572 if (board_config == CXT5047_AUTO) 1568 if (board_config == CXT5047_AUTO)
1573 return patch_conexant_auto(codec); 1569 return patch_conexant_auto(codec);
1574 1570
@@ -1994,10 +1990,8 @@ static int patch_cxt5051(struct hda_codec *codec)
1994 board_config = snd_hda_check_board_config(codec, CXT5051_MODELS, 1990 board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
1995 cxt5051_models, 1991 cxt5051_models,
1996 cxt5051_cfg_tbl); 1992 cxt5051_cfg_tbl);
1997#if 0 /* use the old method just for safety */
1998 if (board_config < 0) 1993 if (board_config < 0)
1999 board_config = CXT5051_AUTO; 1994 board_config = CXT5051_AUTO; /* model=auto as default */
2000#endif
2001 if (board_config == CXT5051_AUTO) 1995 if (board_config == CXT5051_AUTO)
2002 return patch_conexant_auto(codec); 1996 return patch_conexant_auto(codec);
2003 1997
@@ -3115,10 +3109,8 @@ static int patch_cxt5066(struct hda_codec *codec)
3115 3109
3116 board_config = snd_hda_check_board_config(codec, CXT5066_MODELS, 3110 board_config = snd_hda_check_board_config(codec, CXT5066_MODELS,
3117 cxt5066_models, cxt5066_cfg_tbl); 3111 cxt5066_models, cxt5066_cfg_tbl);
3118#if 0 /* use the old method just for safety */
3119 if (board_config < 0) 3112 if (board_config < 0)
3120 board_config = CXT5066_AUTO; 3113 board_config = CXT5066_AUTO; /* model=auto as default */
3121#endif
3122 if (board_config == CXT5066_AUTO) 3114 if (board_config == CXT5066_AUTO)
3123 return patch_conexant_auto(codec); 3115 return patch_conexant_auto(codec);
3124 3116