aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-06-13 23:49:37 -0400
committerTakashi Iwai <tiwai@suse.de>2015-06-15 07:38:47 -0400
commitcf8a471909dd6a0df3efe2586cab5323184b4a7d (patch)
tree5458a72b144aa0aee52771e9fa395342cf8151bc /sound/firewire
parent8d1c2694e45bd5a1b7e79734952e8dfb6f2974a6 (diff)
ALSA: bebob: add support for Behringer FCA 610/1616
They're based on DM1500 (ArchWave produced), and BeBoB version 3 is installed. $ cat /proc/asound/FCA610/firewire/firmware Manufacturer: bridgeCo Protocol Ver: 3 Build Ver: 0 GUID: 0x001564000002AD73 Model ID: 0x03 Model Rev: 0 Firmware Date: 20121102 Firmware Time: 153431 Firmware ID: 0x610 Firmware Ver: 8348 Base Addr: 0x400C0080 Max Size: 1422624 Loader Date: 20121015 Loader Time: 104710 Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/Kconfig1
-rw-r--r--sound/firewire/bebob/bebob.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index 2a0a9aa3518f..8850b7de1d38 100644
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -95,6 +95,7 @@ config SND_BEBOB
95 * Tascam IF-FW/DM 95 * Tascam IF-FW/DM
96 * Behringer XENIX UFX 1204/1604 96 * Behringer XENIX UFX 1204/1604
97 * Behringer Digital Mixer X32 series (X-UF Card) 97 * Behringer Digital Mixer X32 series (X-UF Card)
98 * Behringer FCA610/1616
98 * Apogee Rosetta 200/400 (X-FireWire card) 99 * Apogee Rosetta 200/400 (X-FireWire card)
99 * Apogee DA/AD/DD-16X (X-FireWire card) 100 * Apogee DA/AD/DD-16X (X-FireWire card)
100 * Apogee Ensemble 101 * Apogee Ensemble
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 920571bc3c60..27a04ac8ffee 100644
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -373,6 +373,10 @@ static const struct ieee1394_device_id bebob_id_table[] = {
373 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00001604, &spec_normal), 373 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00001604, &spec_normal),
374 /* Behringer, Digital Mixer X32 series (X-UF Card) */ 374 /* Behringer, Digital Mixer X32 series (X-UF Card) */
375 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00000006, &spec_normal), 375 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00000006, &spec_normal),
376 /* Behringer, F-Control Audio 1616 */
377 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x001616, &spec_normal),
378 /* Behringer, F-Control Audio 610 */
379 SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x000610, &spec_normal),
376 /* Apogee Electronics, Rosetta 200/400 (X-FireWire card) */ 380 /* Apogee Electronics, Rosetta 200/400 (X-FireWire card) */
377 /* Apogee Electronics, DA/AD/DD-16X (X-FireWire card) */ 381 /* Apogee Electronics, DA/AD/DD-16X (X-FireWire card) */
378 SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x00010048, &spec_normal), 382 SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x00010048, &spec_normal),
@@ -447,8 +451,6 @@ static const struct ieee1394_device_id bebob_id_table[] = {
447 /* IDs are unknown but able to be supported */ 451 /* IDs are unknown but able to be supported */
448 /* Apogee, Mini-ME Firewire */ 452 /* Apogee, Mini-ME Firewire */
449 /* Apogee, Mini-DAC Firewire */ 453 /* Apogee, Mini-DAC Firewire */
450 /* Behringer, F-Control Audio 1616 */
451 /* Behringer, F-Control Audio 610 */
452 /* Cakawalk, Sonar Power Studio 66 */ 454 /* Cakawalk, Sonar Power Studio 66 */
453 /* CME, UF400e */ 455 /* CME, UF400e */
454 /* ESI, Quotafire XL */ 456 /* ESI, Quotafire XL */