xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 5d6fb80a142b5994355ce675c517baba6089d199 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Sakamoto
2021-05-18 17:45:47 +09:00
committed by Greg Kroah-Hartman
parent 7d7f30cf18
commit b30a115e4a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/firewire/Kconfig
View File

@@ -38,7 +38,7 @@ config SND_OXFW
* Mackie(Loud) Onyx 1640i (former model) * Mackie(Loud) Onyx 1640i (former model)
* Mackie(Loud) Onyx Satellite * Mackie(Loud) Onyx Satellite
* Mackie(Loud) Tapco Link.Firewire * Mackie(Loud) Tapco Link.Firewire
* Mackie(Loud) d.4 pro * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC)
* Mackie(Loud) U.420/U.420d * Mackie(Loud) U.420/U.420d
* TASCAM FireOne * TASCAM FireOne
* Stanton Controllers & Systems 1 Deck/Mixer * Stanton Controllers & Systems 1 Deck/Mixer
@@ -84,7 +84,7 @@ config SND_BEBOB
* PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394
* BridgeCo RDAudio1/Audio5 * BridgeCo RDAudio1/Audio5
* Mackie Onyx 1220/1620/1640 (FireWire I/O Card) * Mackie Onyx 1220/1620/1640 (FireWire I/O Card)
* Mackie d.2 (FireWire Option) and d.2 Pro * Mackie d.2 (optional FireWire card with DM1000 ASIC)
* Stanton FinalScratch 2 (ScratchAmp) * Stanton FinalScratch 2 (ScratchAmp)
* Tascam IF-FW/DM * Tascam IF-FW/DM
* Behringer XENIX UFX 1204/1604 * Behringer XENIX UFX 1204/1604

2
sound/firewire/bebob/bebob.c
View File

@@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {
SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal),
/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */
SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal),
// Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in). // Mackie, d.2 (optional Firewire card with DM1000).
SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal),
/* Stanton, ScratchAmp */ /* Stanton, ScratchAmp */
SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),

2
sound/firewire/oxfw/oxfw.c
View File

@@ -355,7 +355,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
* Onyx-i series (former models): 0x081216 * Onyx-i series (former models): 0x081216
* Mackie Onyx Satellite: 0x00200f * Mackie Onyx Satellite: 0x00200f
* Tapco LINK.firewire 4x6: 0x000460 * Tapco LINK.firewire 4x6: 0x000460
* d.4 pro: Unknown * d.2 pro/d.4 pro (built-in card): Unknown
* U.420: Unknown * U.420: Unknown
* U.420d: Unknown * U.420d: Unknown
*/ */