diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-05 11:54:05 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-05 11:54:05 -0500 |
commit | fab1285a51b7bf55adb4678d82e606829c9dab85 (patch) | |
tree | d01d0e12e7d7848bacd3cc207729b95ef06d152d /sound/pci/hda | |
parent | 33499a15c2f7addc81695778753c2338b960eff7 (diff) |
ALSA: hda - Name Haswell HDMI controllers better
"HDA Intel MID" is no correct name for Haswell HDMI controllers.
Give them a better name, "HDA Intel HDMI".
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 9cbd1259a5be..17f4aa8cddd5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -569,6 +569,7 @@ enum { | |||
569 | AZX_DRIVER_ICH, | 569 | AZX_DRIVER_ICH, |
570 | AZX_DRIVER_PCH, | 570 | AZX_DRIVER_PCH, |
571 | AZX_DRIVER_SCH, | 571 | AZX_DRIVER_SCH, |
572 | AZX_DRIVER_HDMI, | ||
572 | AZX_DRIVER_ATI, | 573 | AZX_DRIVER_ATI, |
573 | AZX_DRIVER_ATIHDMI, | 574 | AZX_DRIVER_ATIHDMI, |
574 | AZX_DRIVER_ATIHDMI_NS, | 575 | AZX_DRIVER_ATIHDMI_NS, |
@@ -648,6 +649,7 @@ static char *driver_short_names[] = { | |||
648 | [AZX_DRIVER_ICH] = "HDA Intel", | 649 | [AZX_DRIVER_ICH] = "HDA Intel", |
649 | [AZX_DRIVER_PCH] = "HDA Intel PCH", | 650 | [AZX_DRIVER_PCH] = "HDA Intel PCH", |
650 | [AZX_DRIVER_SCH] = "HDA Intel MID", | 651 | [AZX_DRIVER_SCH] = "HDA Intel MID", |
652 | [AZX_DRIVER_HDMI] = "HDA Intel HDMI", | ||
651 | [AZX_DRIVER_ATI] = "HDA ATI SB", | 653 | [AZX_DRIVER_ATI] = "HDA ATI SB", |
652 | [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI", | 654 | [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI", |
653 | [AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI", | 655 | [AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI", |
@@ -3997,11 +3999,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { | |||
3997 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, | 3999 | .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, |
3998 | /* Haswell */ | 4000 | /* Haswell */ |
3999 | { PCI_DEVICE(0x8086, 0x0a0c), | 4001 | { PCI_DEVICE(0x8086, 0x0a0c), |
4000 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL }, | 4002 | .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL }, |
4001 | { PCI_DEVICE(0x8086, 0x0c0c), | 4003 | { PCI_DEVICE(0x8086, 0x0c0c), |
4002 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL }, | 4004 | .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL }, |
4003 | { PCI_DEVICE(0x8086, 0x0d0c), | 4005 | { PCI_DEVICE(0x8086, 0x0d0c), |
4004 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL }, | 4006 | .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL }, |
4005 | /* 5 Series/3400 */ | 4007 | /* 5 Series/3400 */ |
4006 | { PCI_DEVICE(0x8086, 0x3b56), | 4008 | { PCI_DEVICE(0x8086, 0x3b56), |
4007 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, | 4009 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, |