Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fab1285a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 33499a15

sound/pci/hda/hda_intel.c

+5 −3
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ enum { 
	AZX_DRIVER_ICH,

	AZX_DRIVER_PCH,

	AZX_DRIVER_SCH,

	AZX_DRIVER_HDMI,

	AZX_DRIVER_ATI,

	AZX_DRIVER_ATIHDMI,

	AZX_DRIVER_ATIHDMI_NS,
@@ -648,6 +649,7 @@ static char *driver_short_names[] = { 
	[AZX_DRIVER_ICH] = "HDA Intel",

	[AZX_DRIVER_PCH] = "HDA Intel PCH",

	[AZX_DRIVER_SCH] = "HDA Intel MID",

	[AZX_DRIVER_HDMI] = "HDA Intel HDMI",

	[AZX_DRIVER_ATI] = "HDA ATI SB",

	[AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",

	[AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI",
@@ -3997,11 +3999,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

	/* Haswell */

	{ PCI_DEVICE(0x8086, 0x0a0c),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

	{ PCI_DEVICE(0x8086, 0x0c0c),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

	{ PCI_DEVICE(0x8086, 0x0d0c),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

	/* 5 Series/3400 */

	{ PCI_DEVICE(0x8086, 0x3b56),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },