tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro"

This reverts commit 0edabdfe89581669609eaac5f6a8d0ae6fe95e7f.

I've explained that optional FireWire card for d.2 is also built-in to
d.2 Pro, however it's wrong. The optional card uses DM1000 ASIC and has
'Mackie DJ Mixer' in its model name of configuration ROM. On the other
hand, built-in FireWire card for d.2 Pro and d.4 Pro uses OXFW971 ASIC
and has 'd.Pro' in its model name according to manuals and user
experiences. The former card is not the card for d.2 Pro. They are similar
in appearance but different internally.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210518084557.102681-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Takashi Sakamoto and committed by
Takashi Iwai 5d6fb80a 4c6fe8c5

+4 -4
+2 -2
sound/firewire/Kconfig
··· 38 38 * Mackie(Loud) Onyx 1640i (former model) 39 39 * Mackie(Loud) Onyx Satellite 40 40 * Mackie(Loud) Tapco Link.Firewire 41 - * Mackie(Loud) d.4 pro 41 + * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC) 42 42 * Mackie(Loud) U.420/U.420d 43 43 * TASCAM FireOne 44 44 * Stanton Controllers & Systems 1 Deck/Mixer ··· 84 84 * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 85 85 * BridgeCo RDAudio1/Audio5 86 86 * Mackie Onyx 1220/1620/1640 (FireWire I/O Card) 87 - * Mackie d.2 (FireWire Option) and d.2 Pro 87 + * Mackie d.2 (optional FireWire card with DM1000 ASIC) 88 88 * Stanton FinalScratch 2 (ScratchAmp) 89 89 * Tascam IF-FW/DM 90 90 * Behringer XENIX UFX 1204/1604
+1 -1
sound/firewire/bebob/bebob.c
··· 387 387 SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), 388 388 /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ 389 389 SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), 390 - // Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in). 390 + // Mackie, d.2 (optional Firewire card with DM1000). 391 391 SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), 392 392 /* Stanton, ScratchAmp */ 393 393 SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),
+1 -1
sound/firewire/oxfw/oxfw.c
··· 355 355 * Onyx-i series (former models): 0x081216 356 356 * Mackie Onyx Satellite: 0x00200f 357 357 * Tapco LINK.firewire 4x6: 0x000460 358 - * d.4 pro: Unknown 358 + * d.2 pro/d.4 pro (built-in card): Unknown 359 359 * U.420: Unknown 360 360 * U.420d: Unknown 361 361 */