diff options
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index cca87277baf0..0b6aebacc56b 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -573,9 +573,12 @@ enum { | |||
573 | #define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */ | 573 | #define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */ |
574 | 574 | ||
575 | /* quirks for Intel PCH */ | 575 | /* quirks for Intel PCH */ |
576 | #define AZX_DCAPS_INTEL_PCH \ | 576 | #define AZX_DCAPS_INTEL_PCH_NOPM \ |
577 | (AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_BUFSIZE | \ | 577 | (AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_BUFSIZE | \ |
578 | AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_PM_RUNTIME) | 578 | AZX_DCAPS_COUNT_LPIB_DELAY) |
579 | |||
580 | #define AZX_DCAPS_INTEL_PCH \ | ||
581 | (AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_PM_RUNTIME) | ||
579 | 582 | ||
580 | /* quirks for ATI SB / AMD Hudson */ | 583 | /* quirks for ATI SB / AMD Hudson */ |
581 | #define AZX_DCAPS_PRESET_ATI_SB \ | 584 | #define AZX_DCAPS_PRESET_ATI_SB \ |
@@ -3586,13 +3589,13 @@ static void azx_remove(struct pci_dev *pci) | |||
3586 | static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { | 3589 | static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { |
3587 | /* CPT */ | 3590 | /* CPT */ |
3588 | { PCI_DEVICE(0x8086, 0x1c20), | 3591 | { PCI_DEVICE(0x8086, 0x1c20), |
3589 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, | 3592 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, |
3590 | /* PBG */ | 3593 | /* PBG */ |
3591 | { PCI_DEVICE(0x8086, 0x1d20), | 3594 | { PCI_DEVICE(0x8086, 0x1d20), |
3592 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, | 3595 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, |
3593 | /* Panther Point */ | 3596 | /* Panther Point */ |
3594 | { PCI_DEVICE(0x8086, 0x1e20), | 3597 | { PCI_DEVICE(0x8086, 0x1e20), |
3595 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, | 3598 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, |
3596 | /* Lynx Point */ | 3599 | /* Lynx Point */ |
3597 | { PCI_DEVICE(0x8086, 0x8c20), | 3600 | { PCI_DEVICE(0x8086, 0x8c20), |
3598 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, | 3601 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, |