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

Commit 8443d2eb authored Jan 10, 2011 by Clemens Ladisch Committed by Takashi Iwai Jan 10, 2011

ALSA: oxygen: add X-Meridian 2G support



Add support for the AuzenTech X-Meridian 7.1 2G sound card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 8c50b759

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1527,6 +1527,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
		Module for sound cards based on the C-Media CMI8787/8788 chip:
		* Asound A-8788
		* AuzenTech X-Meridian
		* AuzenTech X-Meridian 2G
		* Bgears b-Enspirer
		* Club3D Theatron DTS
		* HT-Omega Claro (plus)

sound/pci/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,7 @@ config SND_OXYGEN
		C-Media CMI8788 (Oxygen HD Audio) chip:
		* Asound A-8788
		* AuzenTech X-Meridian
		* AuzenTech X-Meridian 2G
		* Bgears b-Enspirer
		* Club3D Theatron DTS
		* HT-Omega Claro (plus)

sound/pci/oxygen/oxygen.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
		{ OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_2CH_OUTPUT },
		/* AuzenTech X-Meridian */
		{ OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
		/* AuzenTech X-Meridian 2G */
		{ OXYGEN_PCI_SUBID(0x5431, 0x017a), .driver_data = MODEL_MERIDIAN },
		/* HT-Omega Claro */
		{ OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
		/* HT-Omega Claro halo */