diff options
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 3 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 | ||||
-rw-r--r-- | sound/pci/hda/patch_si3054.c | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e9d4cb4d07e1..feeed12920b4 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -811,7 +811,7 @@ static void azx_init_chip(struct azx *chip) | |||
811 | /* | 811 | /* |
812 | * interrupt handler | 812 | * interrupt handler |
813 | */ | 813 | */ |
814 | static irqreturn_t azx_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 814 | static irqreturn_t azx_interrupt(int irq, void *dev_id) |
815 | { | 815 | { |
816 | struct azx *chip = dev_id; | 816 | struct azx *chip = dev_id; |
817 | struct azx_dev *azx_dev; | 817 | struct azx_dev *azx_dev; |
@@ -1682,6 +1682,7 @@ static struct pci_device_id azx_ids[] = { | |||
1682 | { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */ | 1682 | { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */ |
1683 | { 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 026c */ | 1683 | { 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 026c */ |
1684 | { 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 0371 */ | 1684 | { 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 0371 */ |
1685 | { 0x10de, 0x03f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 03f0 */ | ||
1685 | { 0, } | 1686 | { 0, } |
1686 | }; | 1687 | }; |
1687 | MODULE_DEVICE_TABLE(pci, azx_ids); | 1688 | MODULE_DEVICE_TABLE(pci, azx_ids); |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d08d2e399c8f..84a3eb8aacc2 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -5076,6 +5076,10 @@ static struct hda_board_config alc883_cfg_tbl[] = { | |||
5076 | { .modelname = "acer", .config = ALC883_ACER }, | 5076 | { .modelname = "acer", .config = ALC883_ACER }, |
5077 | { .pci_subvendor = 0x1025, .pci_subdevice = 0/*0x0102*/, | 5077 | { .pci_subvendor = 0x1025, .pci_subdevice = 0/*0x0102*/, |
5078 | .config = ALC883_ACER }, | 5078 | .config = ALC883_ACER }, |
5079 | { .pci_subvendor = 0x1025, .pci_subdevice = 0x0102, | ||
5080 | .config = ALC883_ACER }, | ||
5081 | { .pci_subvendor = 0x1025, .pci_subdevice = 0x009f, | ||
5082 | .config = ALC883_ACER }, | ||
5079 | { .modelname = "auto", .config = ALC883_AUTO }, | 5083 | { .modelname = "auto", .config = ALC883_AUTO }, |
5080 | {} | 5084 | {} |
5081 | }; | 5085 | }; |
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index 76ec3d75fa9e..cc87dff1eb56 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c | |||
@@ -297,8 +297,13 @@ static int patch_si3054(struct hda_codec *codec) | |||
297 | struct hda_codec_preset snd_hda_preset_si3054[] = { | 297 | struct hda_codec_preset snd_hda_preset_si3054[] = { |
298 | { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 }, | 298 | { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 }, |
299 | { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 }, | 299 | { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 }, |
300 | { .id = 0x11c11040, .name = "Si3054", .patch = patch_si3054 }, | ||
300 | { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 }, | 301 | { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 }, |
302 | { .id = 0x11c13055, .name = "Si3054", .patch = patch_si3054 }, | ||
303 | { .id = 0x11c13155, .name = "Si3054", .patch = patch_si3054 }, | ||
304 | { .id = 0x10573055, .name = "Si3054", .patch = patch_si3054 }, | ||
301 | { .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 }, | 305 | { .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 }, |
306 | { .id = 0x10573155, .name = "Si3054", .patch = patch_si3054 }, | ||
302 | {} | 307 | {} |
303 | }; | 308 | }; |
304 | 309 | ||