aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKailang Yang <kailang@realtek.com>2017-06-30 03:22:57 -0400
committerTakashi Iwai <tiwai@suse.de>2017-06-30 04:59:18 -0400
commit4731d5de4b1ca8d2565782cc3aeac392db07c075 (patch)
tree8229b6643252d80548052e23165ffd3aace538df
parentdba9b7b6ca1af60fd21137c18795a81a5652c5ae (diff)
ALSA: hda/realtek - Remove ALC285 device ID
0x0285 Device ID was not used. It just assigned for alias of ALC293 as backup. So, remove it first. Because our new codec will use this device ID. Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c79491a1cd47..80c7c832d442 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -340,7 +340,6 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
340 case 0x10ec0299: 340 case 0x10ec0299:
341 alc_update_coef_idx(codec, 0x10, 1<<9, 0); 341 alc_update_coef_idx(codec, 0x10, 1<<9, 0);
342 break; 342 break;
343 case 0x10ec0285:
344 case 0x10ec0293: 343 case 0x10ec0293:
345 alc_update_coef_idx(codec, 0xa, 1<<13, 0); 344 alc_update_coef_idx(codec, 0xa, 1<<13, 0);
346 break; 345 break;
@@ -2738,7 +2737,7 @@ enum {
2738 ALC269_TYPE_ALC282, 2737 ALC269_TYPE_ALC282,
2739 ALC269_TYPE_ALC283, 2738 ALC269_TYPE_ALC283,
2740 ALC269_TYPE_ALC284, 2739 ALC269_TYPE_ALC284,
2741 ALC269_TYPE_ALC285, 2740 ALC269_TYPE_ALC293,
2742 ALC269_TYPE_ALC286, 2741 ALC269_TYPE_ALC286,
2743 ALC269_TYPE_ALC298, 2742 ALC269_TYPE_ALC298,
2744 ALC269_TYPE_ALC255, 2743 ALC269_TYPE_ALC255,
@@ -2764,7 +2763,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
2764 case ALC269_TYPE_ALC269VC: 2763 case ALC269_TYPE_ALC269VC:
2765 case ALC269_TYPE_ALC280: 2764 case ALC269_TYPE_ALC280:
2766 case ALC269_TYPE_ALC284: 2765 case ALC269_TYPE_ALC284:
2767 case ALC269_TYPE_ALC285: 2766 case ALC269_TYPE_ALC293:
2768 ssids = alc269va_ssids; 2767 ssids = alc269va_ssids;
2769 break; 2768 break;
2770 case ALC269_TYPE_ALC269VB: 2769 case ALC269_TYPE_ALC269VB:
@@ -6678,9 +6677,8 @@ static int patch_alc269(struct hda_codec *codec)
6678 case 0x10ec0292: 6677 case 0x10ec0292:
6679 spec->codec_variant = ALC269_TYPE_ALC284; 6678 spec->codec_variant = ALC269_TYPE_ALC284;
6680 break; 6679 break;
6681 case 0x10ec0285:
6682 case 0x10ec0293: 6680 case 0x10ec0293:
6683 spec->codec_variant = ALC269_TYPE_ALC285; 6681 spec->codec_variant = ALC269_TYPE_ALC293;
6684 break; 6682 break;
6685 case 0x10ec0286: 6683 case 0x10ec0286:
6686 case 0x10ec0288: 6684 case 0x10ec0288:
@@ -7752,7 +7750,6 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
7752 HDA_CODEC_ENTRY(0x10ec0282, "ALC282", patch_alc269), 7750 HDA_CODEC_ENTRY(0x10ec0282, "ALC282", patch_alc269),
7753 HDA_CODEC_ENTRY(0x10ec0283, "ALC283", patch_alc269), 7751 HDA_CODEC_ENTRY(0x10ec0283, "ALC283", patch_alc269),
7754 HDA_CODEC_ENTRY(0x10ec0284, "ALC284", patch_alc269), 7752 HDA_CODEC_ENTRY(0x10ec0284, "ALC284", patch_alc269),
7755 HDA_CODEC_ENTRY(0x10ec0285, "ALC285", patch_alc269),
7756 HDA_CODEC_ENTRY(0x10ec0286, "ALC286", patch_alc269), 7753 HDA_CODEC_ENTRY(0x10ec0286, "ALC286", patch_alc269),
7757 HDA_CODEC_ENTRY(0x10ec0288, "ALC288", patch_alc269), 7754 HDA_CODEC_ENTRY(0x10ec0288, "ALC288", patch_alc269),
7758 HDA_CODEC_ENTRY(0x10ec0290, "ALC290", patch_alc269), 7755 HDA_CODEC_ENTRY(0x10ec0290, "ALC290", patch_alc269),