| From 529a933725d458e7f81d0712ca356fd547f110d8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 19 Jun 2021 17:39:22 +0900 |
| Subject: ALSA: bebob: add support for ToneWeal FW66 |
| |
| From: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| |
| [ Upstream commit 50ebe56222bfa0911a932930f9229ee5995508d9 ] |
| |
| A user of FFADO project reported the issue of ToneWeal FW66. As a result, |
| the device is identified as one of applications of BeBoB solution. |
| |
| I note that in the report the device returns contradictory result in plug |
| discovery process for audio subunit. Fortunately ALSA BeBoB driver doesn't |
| perform it thus it's likely to handle the device without issues. |
| |
| I receive no reaction to test request for this patch yet, however it would |
| be worth to add support for it. |
| |
| daniel@gibbonmoon:/sys/bus/firewire/devices/fw1$ grep -r . * |
| Binary file config_rom matches |
| dev:244:1 |
| guid:0x0023270002000000 |
| hardware_version:0x000002 |
| is_local:0 |
| model:0x020002 |
| model_name:FW66 |
| power/runtime_active_time:0 |
| power/runtime_active_kids:0 |
| power/runtime_usage:0 |
| power/runtime_status:unsupported |
| power/async:disabled |
| power/runtime_suspended_time:0 |
| power/runtime_enabled:disabled |
| power/control:auto |
| subsystem/drivers_autoprobe:1 |
| uevent:MAJOR=244 |
| uevent:MINOR=1 |
| uevent:DEVNAME=fw1 |
| units:0x00a02d:0x010001 |
| vendor:0x002327 |
| vendor_name:ToneWeal |
| fw1.0/uevent:MODALIAS=ieee1394:ven00002327mo00020002sp0000A02Dver00010001 |
| fw1.0/power/runtime_active_time:0 |
| fw1.0/power/runtime_active_kids:0 |
| fw1.0/power/runtime_usage:0 |
| fw1.0/power/runtime_status:unsupported |
| fw1.0/power/async:disabled |
| fw1.0/power/runtime_suspended_time:0 |
| fw1.0/power/runtime_enabled:disabled |
| fw1.0/power/control:auto |
| fw1.0/model:0x020002 |
| fw1.0/rom_index:15 |
| fw1.0/specifier_id:0x00a02d |
| fw1.0/model_name:FW66 |
| fw1.0/version:0x010001 |
| fw1.0/modalias:ieee1394:ven00002327mo00020002sp0000A02Dver00010001 |
| |
| Cc: Daniel Jozsef <daniel.jozsef@gmail.com> |
| Reference: https://lore.kernel.org/alsa-devel/20200119164335.GA11974@workstation/ |
| Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| Link: https://lore.kernel.org/r/20210619083922.16060-1-o-takashi@sakamocchi.jp |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/firewire/Kconfig | 1 + |
| sound/firewire/bebob/bebob.c | 3 +++ |
| 2 files changed, 4 insertions(+) |
| |
| diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig |
| index def1f3d5ecf5..12664c3a1414 100644 |
| --- a/sound/firewire/Kconfig |
| +++ b/sound/firewire/Kconfig |
| @@ -110,6 +110,7 @@ config SND_BEBOB |
| * M-Audio Ozonic/NRV10/ProfireLightBridge |
| * M-Audio FireWire 1814/ProjectMix IO |
| * Digidesign Mbox 2 Pro |
| + * ToneWeal FW66 |
| |
| To compile this driver as a module, choose M here: the module |
| will be called snd-bebob. |
| diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c |
| index 90e98a6d1546..67fa0f2178b0 100644 |
| --- a/sound/firewire/bebob/bebob.c |
| +++ b/sound/firewire/bebob/bebob.c |
| @@ -59,6 +59,7 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS); |
| #define VEN_MAUDIO1 0x00000d6c |
| #define VEN_MAUDIO2 0x000007f5 |
| #define VEN_DIGIDESIGN 0x00a07e |
| +#define OUI_SHOUYO 0x002327 |
| |
| #define MODEL_FOCUSRITE_SAFFIRE_BOTH 0x00000000 |
| #define MODEL_MAUDIO_AUDIOPHILE_BOTH 0x00010060 |
| @@ -486,6 +487,8 @@ static const struct ieee1394_device_id bebob_id_table[] = { |
| &maudio_special_spec), |
| /* Digidesign Mbox 2 Pro */ |
| SND_BEBOB_DEV_ENTRY(VEN_DIGIDESIGN, 0x0000a9, &spec_normal), |
| + // Toneweal FW66. |
| + SND_BEBOB_DEV_ENTRY(OUI_SHOUYO, 0x020002, &spec_normal), |
| /* IDs are unknown but able to be supported */ |
| /* Apogee, Mini-ME Firewire */ |
| /* Apogee, Mini-DAC Firewire */ |
| -- |
| 2.30.2 |
| |