| From a7a6e4bce4a5d755c463d7fae8ec32f239aa368b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 May 2021 17:45:47 +0900 |
| Subject: Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" |
| |
| From: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| |
| [ 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> |
| --- |
| sound/firewire/Kconfig | 4 ++-- |
| sound/firewire/bebob/bebob.c | 2 +- |
| sound/firewire/oxfw/oxfw.c | 2 +- |
| 3 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig |
| index 9897bd26a438..def1f3d5ecf5 100644 |
| --- a/sound/firewire/Kconfig |
| +++ b/sound/firewire/Kconfig |
| @@ -38,7 +38,7 @@ config SND_OXFW |
| * Mackie(Loud) Onyx 1640i (former model) |
| * Mackie(Loud) Onyx Satellite |
| * 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 |
| * TASCAM FireOne |
| * Stanton Controllers & Systems 1 Deck/Mixer |
| @@ -84,7 +84,7 @@ config SND_BEBOB |
| * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 |
| * BridgeCo RDAudio1/Audio5 |
| * 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) |
| * Tascam IF-FW/DM |
| * Behringer XENIX UFX 1204/1604 |
| diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c |
| index daeecfa8b9aa..90e98a6d1546 100644 |
| --- a/sound/firewire/bebob/bebob.c |
| +++ b/sound/firewire/bebob/bebob.c |
| @@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = { |
| SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), |
| /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ |
| 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), |
| /* Stanton, ScratchAmp */ |
| SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), |
| diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c |
| index 9eea25c46dc7..5490637d278a 100644 |
| --- a/sound/firewire/oxfw/oxfw.c |
| +++ b/sound/firewire/oxfw/oxfw.c |
| @@ -355,7 +355,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = { |
| * Onyx-i series (former models): 0x081216 |
| * Mackie Onyx Satellite: 0x00200f |
| * Tapco LINK.firewire 4x6: 0x000460 |
| - * d.4 pro: Unknown |
| + * d.2 pro/d.4 pro (built-in card): Unknown |
| * U.420: Unknown |
| * U.420d: Unknown |
| */ |
| -- |
| 2.30.2 |
| |