Commit 0edabdfe authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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



Mackie d.2 has an extension card for IEEE 1394 communication, which uses
BridgeCo DM1000 ASIC. On the other hand, Mackie d.4 Pro has built-in
function for IEEE 1394 communication by Oxford Semiconductor OXFW971,
according to schematic diagram available in Mackie website. Although I
misunderstood that Mackie d.2 Pro would be also a model with OXFW971,
it's wrong. Mackie d.2 Pro is a model which includes the extension card
as factory settings.

This commit fixes entries in Kconfig and comment in ALSA OXFW driver.

Cc: <stable@vger.kernel.org>
Fixes: fd6f4b0d ("ALSA: bebob: Add skelton for BeBoB based devices")
Fixes: ec4dba50 ("ALSA: oxfw: Add support for Behringer/Mackie devices")
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210513125652.110249-3-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1b660489

sound/firewire/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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.2 pro/d.4 pro

	   * Mackie(Loud) d.4 pro

	   * 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)

	  * Mackie d.2 (FireWire Option) and d.2 Pro

	  * Stanton FinalScratch 2 (ScratchAmp)

	  * Tascam IF-FW/DM

	  * Behringer XENIX UFX 1204/1604

sound/firewire/bebob/bebob.c

+1 −1
Original line number Diff line number Diff line
@@ -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) */

	// Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in).

	SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal),

	/* Stanton, ScratchAmp */

	SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),

sound/firewire/oxfw/oxfw.c

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ 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.2 pro:				Unknown

	 *  d.4 pro:				Unknown

	 *  U.420:				Unknown

	 *  U.420d:				Unknown