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

Commit a6f6192b authored by James Courtier-Dutton's avatar James Courtier-Dutton Committed by Jaroslav Kysela
Browse files

[ALSA] emu10k1: Sort by card id. 



EMU10K1/EMU10K2 driver

Signed-off-by: default avatarJames Courtier-Dutton <James@superbug.co.uk>
parent 3818152e

sound/pci/emu10k1/emu10k1_main.c

+37 −43
Original line number Diff line number Diff line
@@ -714,54 +714,49 @@ static emu_chip_details_t emu_chip_details[] = { 
	 .emu10k2_chip = 1,

	 .ca0102_chip = 1,

	 .ac97_chip = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,

	 .driver = "EMU10K1", .name = "E-mu APS [4001]", 

	 .id = "APS",

	 .emu10k1_chip = 1,

	 .ecard = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,

	 .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,

	 .driver = "EMU10K1", .name = "SBLive! [SB0105]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,

	 .driver = "EMU10K1", .name = "SB Live 5.1", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,

	 .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,

	 .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,

	 .driver = "EMU10K1", .name = "SBLive! [CT4620]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,

	 .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,

	 .driver = "EMU10K1", .name = "SB Live 5.1", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,

	 .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,

	 .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,

	 .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,
@@ -772,50 +767,49 @@ static emu_chip_details_t emu_chip_details[] = { 
	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,

	 .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,

	 .driver = "EMU10K1", .name = "SBLive! Value [SB0060]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,

	 .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 

	 .id = "Live",

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,

	 .driver = "EMU10K1", .name = "E-mu APS [4001]", 

	 .id = "APS",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,

	 .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", 

	 .ecard = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,

	 .driver = "EMU10K1", .name = "SBLive! [CT4620]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,

	 .sblive51 = 1} ,

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,

	 .driver = "EMU10K1", .name = "SBLive! [SB0105]", 

	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,

	 .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 

	 .id = "Live",

	 .emu10k1_chip = 1,

	 .ac97_chip = 1,