aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/sound/alsa/HD-Audio.txt4
-rw-r--r--sound/pci/hda/patch_analog.c3
-rw-r--r--sound/pci/hda/patch_cmedia.c3
-rw-r--r--sound/pci/hda/patch_realtek.c34
-rw-r--r--sound/pci/hda/patch_sigmatel.c34
5 files changed, 42 insertions, 36 deletions
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index 0b5b480708f8..7b8a5f947d1d 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -139,6 +139,10 @@ The driver checks PCI SSID and looks through the static configuration
139table until any matching entry is found. If you have a new machine, 139table until any matching entry is found. If you have a new machine,
140you may see a message like below: 140you may see a message like below:
141------------------------------------------------------------------------ 141------------------------------------------------------------------------
142 hda_codec: ALC880: BIOS auto-probing.
143------------------------------------------------------------------------
144Meanwhile, in the earlier versions, you would see a message like:
145------------------------------------------------------------------------
142 hda_codec: Unknown model for ALC880, trying auto-probe from BIOS... 146 hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...
143------------------------------------------------------------------------ 147------------------------------------------------------------------------
144Even if you see such a message, DON'T PANIC. Take a deep breath and 148Even if you see such a message, DON'T PANIC. Take a deep breath and
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 3da85caf8af1..ab3bcb78ace9 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -2982,7 +2982,8 @@ static int patch_ad1988(struct hda_codec *codec)
2982 board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST, 2982 board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST,
2983 ad1988_models, ad1988_cfg_tbl); 2983 ad1988_models, ad1988_cfg_tbl);
2984 if (board_config < 0) { 2984 if (board_config < 0) {
2985 printk(KERN_INFO "hda_codec: Unknown model for AD1988, trying auto-probe from BIOS...\n"); 2985 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
2986 codec->chip_name);
2986 board_config = AD1988_AUTO; 2987 board_config = AD1988_AUTO;
2987 } 2988 }
2988 2989
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index c921264bbd71..780e1a72114a 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -635,7 +635,8 @@ static int patch_cmi9880(struct hda_codec *codec)
635 cmi9880_models, 635 cmi9880_models,
636 cmi9880_cfg_tbl); 636 cmi9880_cfg_tbl);
637 if (spec->board_config < 0) { 637 if (spec->board_config < 0) {
638 snd_printdd(KERN_INFO "hda_codec: Unknown model for CMI9880\n"); 638 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
639 codec->chip_name);
639 spec->board_config = CMI_AUTO; /* try everything */ 640 spec->board_config = CMI_AUTO; /* try everything */
640 } 641 }
641 642
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index df87c01e27dd..6794d028119d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4584,8 +4584,8 @@ static int patch_alc880(struct hda_codec *codec)
4584 alc880_models, 4584 alc880_models,
4585 alc880_cfg_tbl); 4585 alc880_cfg_tbl);
4586 if (board_config < 0) { 4586 if (board_config < 0) {
4587 printk(KERN_INFO "hda_codec: Unknown model for %s, " 4587 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
4588 "trying auto-probe from BIOS...\n", codec->chip_name); 4588 codec->chip_name);
4589 board_config = ALC880_AUTO; 4589 board_config = ALC880_AUTO;
4590 } 4590 }
4591 4591
@@ -6228,8 +6228,7 @@ static int patch_alc260(struct hda_codec *codec)
6228 alc260_models, 6228 alc260_models,
6229 alc260_cfg_tbl); 6229 alc260_cfg_tbl);
6230 if (board_config < 0) { 6230 if (board_config < 0) {
6231 snd_printd(KERN_INFO "hda_codec: Unknown model for %s, " 6231 snd_printd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
6232 "trying auto-probe from BIOS...\n",
6233 codec->chip_name); 6232 codec->chip_name);
6234 board_config = ALC260_AUTO; 6233 board_config = ALC260_AUTO;
6235 } 6234 }
@@ -9526,8 +9525,7 @@ static int patch_alc882(struct hda_codec *codec)
9526 ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl); 9525 ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl);
9527 9526
9528 if (board_config < 0 || board_config >= ALC882_MODEL_LAST) { 9527 if (board_config < 0 || board_config >= ALC882_MODEL_LAST) {
9529 printk(KERN_INFO "hda_codec: Unknown model for %s, " 9528 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
9530 "trying auto-probe from BIOS...\n",
9531 codec->chip_name); 9529 codec->chip_name);
9532 board_config = ALC882_AUTO; 9530 board_config = ALC882_AUTO;
9533 } 9531 }
@@ -11406,8 +11404,8 @@ static int patch_alc262(struct hda_codec *codec)
11406 alc262_cfg_tbl); 11404 alc262_cfg_tbl);
11407 11405
11408 if (board_config < 0) { 11406 if (board_config < 0) {
11409 printk(KERN_INFO "hda_codec: Unknown model for %s, " 11407 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
11410 "trying auto-probe from BIOS...\n", codec->chip_name); 11408 codec->chip_name);
11411 board_config = ALC262_AUTO; 11409 board_config = ALC262_AUTO;
11412 } 11410 }
11413 11411
@@ -12479,8 +12477,8 @@ static int patch_alc268(struct hda_codec *codec)
12479 alc268_cfg_tbl); 12477 alc268_cfg_tbl);
12480 12478
12481 if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { 12479 if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
12482 printk(KERN_INFO "hda_codec: Unknown model for %s, " 12480 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
12483 "trying auto-probe from BIOS...\n", codec->chip_name); 12481 codec->chip_name);
12484 board_config = ALC268_AUTO; 12482 board_config = ALC268_AUTO;
12485 } 12483 }
12486 12484
@@ -13297,8 +13295,8 @@ static int patch_alc269(struct hda_codec *codec)
13297 alc269_cfg_tbl); 13295 alc269_cfg_tbl);
13298 13296
13299 if (board_config < 0) { 13297 if (board_config < 0) {
13300 printk(KERN_INFO "hda_codec: Unknown model for %s, " 13298 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
13301 "trying auto-probe from BIOS...\n", codec->chip_name); 13299 codec->chip_name);
13302 board_config = ALC269_AUTO; 13300 board_config = ALC269_AUTO;
13303 } 13301 }
13304 13302
@@ -14448,8 +14446,8 @@ static int patch_alc861(struct hda_codec *codec)
14448 alc861_cfg_tbl); 14446 alc861_cfg_tbl);
14449 14447
14450 if (board_config < 0) { 14448 if (board_config < 0) {
14451 printk(KERN_INFO "hda_codec: Unknown model for %s, " 14449 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
14452 "trying auto-probe from BIOS...\n", codec->chip_name); 14450 codec->chip_name);
14453 board_config = ALC861_AUTO; 14451 board_config = ALC861_AUTO;
14454 } 14452 }
14455 14453
@@ -15372,8 +15370,8 @@ static int patch_alc861vd(struct hda_codec *codec)
15372 alc861vd_cfg_tbl); 15370 alc861vd_cfg_tbl);
15373 15371
15374 if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) { 15372 if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) {
15375 printk(KERN_INFO "hda_codec: Unknown model for %s, " 15373 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
15376 "trying auto-probe from BIOS...\n", codec->chip_name); 15374 codec->chip_name);
15377 board_config = ALC861VD_AUTO; 15375 board_config = ALC861VD_AUTO;
15378 } 15376 }
15379 15377
@@ -17296,8 +17294,8 @@ static int patch_alc662(struct hda_codec *codec)
17296 alc662_models, 17294 alc662_models,
17297 alc662_cfg_tbl); 17295 alc662_cfg_tbl);
17298 if (board_config < 0) { 17296 if (board_config < 0) {
17299 printk(KERN_INFO "hda_codec: Unknown model for %s, " 17297 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
17300 "trying auto-probe from BIOS...\n", codec->chip_name); 17298 codec->chip_name);
17301 board_config = ALC662_AUTO; 17299 board_config = ALC662_AUTO;
17302 } 17300 }
17303 17301
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 9de97f306999..c6dc625c66b4 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4794,7 +4794,8 @@ static int patch_stac9200(struct hda_codec *codec)
4794 stac9200_models, 4794 stac9200_models,
4795 stac9200_cfg_tbl); 4795 stac9200_cfg_tbl);
4796 if (spec->board_config < 0) 4796 if (spec->board_config < 0)
4797 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n"); 4797 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
4798 codec->chip_name);
4798 else 4799 else
4799 stac92xx_set_config_regs(codec, 4800 stac92xx_set_config_regs(codec,
4800 stac9200_brd_tbl[spec->board_config]); 4801 stac9200_brd_tbl[spec->board_config]);
@@ -4866,8 +4867,8 @@ static int patch_stac925x(struct hda_codec *codec)
4866 stac925x_cfg_tbl); 4867 stac925x_cfg_tbl);
4867 again: 4868 again:
4868 if (spec->board_config < 0) 4869 if (spec->board_config < 0)
4869 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," 4870 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
4870 "using BIOS defaults\n"); 4871 codec->chip_name);
4871 else 4872 else
4872 stac92xx_set_config_regs(codec, 4873 stac92xx_set_config_regs(codec,
4873 stac925x_brd_tbl[spec->board_config]); 4874 stac925x_brd_tbl[spec->board_config]);
@@ -4949,8 +4950,8 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
4949 stac92hd73xx_cfg_tbl); 4950 stac92hd73xx_cfg_tbl);
4950again: 4951again:
4951 if (spec->board_config < 0) 4952 if (spec->board_config < 0)
4952 snd_printdd(KERN_INFO "hda_codec: Unknown model for" 4953 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
4953 " STAC92HD73XX, using BIOS defaults\n"); 4954 codec->chip_name);
4954 else 4955 else
4955 stac92xx_set_config_regs(codec, 4956 stac92xx_set_config_regs(codec,
4956 stac92hd73xx_brd_tbl[spec->board_config]); 4957 stac92hd73xx_brd_tbl[spec->board_config]);
@@ -5125,8 +5126,8 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
5125 stac92hd83xxx_cfg_tbl); 5126 stac92hd83xxx_cfg_tbl);
5126again: 5127again:
5127 if (spec->board_config < 0) 5128 if (spec->board_config < 0)
5128 snd_printdd(KERN_INFO "hda_codec: Unknown model for" 5129 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5129 " STAC92HD83XXX, using BIOS defaults\n"); 5130 codec->chip_name);
5130 else 5131 else
5131 stac92xx_set_config_regs(codec, 5132 stac92xx_set_config_regs(codec,
5132 stac92hd83xxx_brd_tbl[spec->board_config]); 5133 stac92hd83xxx_brd_tbl[spec->board_config]);
@@ -5291,8 +5292,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
5291 stac92hd71bxx_cfg_tbl); 5292 stac92hd71bxx_cfg_tbl);
5292again: 5293again:
5293 if (spec->board_config < 0) 5294 if (spec->board_config < 0)
5294 snd_printdd(KERN_INFO "hda_codec: Unknown model for" 5295 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5295 " STAC92HD71BXX, using BIOS defaults\n"); 5296 codec->chip_name);
5296 else 5297 else
5297 stac92xx_set_config_regs(codec, 5298 stac92xx_set_config_regs(codec,
5298 stac92hd71bxx_brd_tbl[spec->board_config]); 5299 stac92hd71bxx_brd_tbl[spec->board_config]);
@@ -5547,8 +5548,8 @@ static int patch_stac922x(struct hda_codec *codec)
5547 5548
5548 again: 5549 again:
5549 if (spec->board_config < 0) 5550 if (spec->board_config < 0)
5550 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, " 5551 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5551 "using BIOS defaults\n"); 5552 codec->chip_name);
5552 else 5553 else
5553 stac92xx_set_config_regs(codec, 5554 stac92xx_set_config_regs(codec,
5554 stac922x_brd_tbl[spec->board_config]); 5555 stac922x_brd_tbl[spec->board_config]);
@@ -5610,8 +5611,8 @@ static int patch_stac927x(struct hda_codec *codec)
5610 stac927x_cfg_tbl); 5611 stac927x_cfg_tbl);
5611 again: 5612 again:
5612 if (spec->board_config < 0) 5613 if (spec->board_config < 0)
5613 snd_printdd(KERN_INFO "hda_codec: Unknown model for" 5614 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5614 "STAC927x, using BIOS defaults\n"); 5615 codec->chip_name);
5615 else 5616 else
5616 stac92xx_set_config_regs(codec, 5617 stac92xx_set_config_regs(codec,
5617 stac927x_brd_tbl[spec->board_config]); 5618 stac927x_brd_tbl[spec->board_config]);
@@ -5738,7 +5739,8 @@ static int patch_stac9205(struct hda_codec *codec)
5738 stac9205_cfg_tbl); 5739 stac9205_cfg_tbl);
5739 again: 5740 again:
5740 if (spec->board_config < 0) 5741 if (spec->board_config < 0)
5741 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n"); 5742 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5743 codec->chip_name);
5742 else 5744 else
5743 stac92xx_set_config_regs(codec, 5745 stac92xx_set_config_regs(codec,
5744 stac9205_brd_tbl[spec->board_config]); 5746 stac9205_brd_tbl[spec->board_config]);
@@ -5890,8 +5892,8 @@ static int patch_stac9872(struct hda_codec *codec)
5890 stac9872_models, 5892 stac9872_models,
5891 stac9872_cfg_tbl); 5893 stac9872_cfg_tbl);
5892 if (spec->board_config < 0) 5894 if (spec->board_config < 0)
5893 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9872, " 5895 snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
5894 "using BIOS defaults\n"); 5896 codec->chip_name);
5895 else 5897 else
5896 stac92xx_set_config_regs(codec, 5898 stac92xx_set_config_regs(codec,
5897 stac9872_brd_tbl[spec->board_config]); 5899 stac9872_brd_tbl[spec->board_config]);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-20 12:20:27 -0500