diff mbox series

ALSA: firewire-motu: add support for hybrid model of MOTU Ultralite mk3

Message ID 20210606043409.40019-1-o-takashi@sakamocchi.jp (mailing list archive)
State New, archived
Headers show
Series ALSA: firewire-motu: add support for hybrid model of MOTU Ultralite mk3 | expand

Commit Message

Takashi Sakamoto June 6, 2021, 4:34 a.m. UTC
This commit adds support for the hybrid model of MOTU Ultralite mk3 with
alpha connector, which is already discontinued. The hardware specification
of the model is the same as the one of FireWire-only model.

$ cd linux-firewire-utils
$ python3 src/crpp < /sys/bus/firewire/devices/fw1/config_rom
               ROM header and bus information block
               -----------------------------------------------------------------
400  04101573  bus_info_length 4, crc_length 16, crc 5491
404  31333934  bus_name "1394"
408  20ff7000  irmc 0, cmc 0, isc 1, bmc 0, cyc_clk_acc 255, max_rec 7 (256)
40c  0001f200  company_id 0001f2     |
410  000a059c  device_id 00000a059c  | EUI-64 0001f200000a059c

               root directory
               -----------------------------------------------------------------
414  0004ef04  directory_length 4, crc 61188
418  030001f2  vendor
41c  0c0083c0  node capabilities per IEEE 1394
420  d1000002  --> unit directory at 428
424  8d000005  --> eui-64 leaf at 438

               unit directory at 428
               -----------------------------------------------------------------
428  0003f00b  directory_length 3, crc 61451
42c  120001f2  specifier id
430  13000030  version
434  17103800  model

               eui-64 leaf at 438
               -----------------------------------------------------------------
438  0002d89c  leaf_length 2, crc 55452
43c  0001f200  company_id 0001f2     |
440  000a059c  device_id 00000a059c  | EUI-64 0001f200000a059c

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/Kconfig     | 2 ++
 sound/firewire/motu/motu.c | 1 +
 2 files changed, 3 insertions(+)

Comments

Takashi Iwai June 6, 2021, 8:06 a.m. UTC | #1
On Sun, 06 Jun 2021 06:34:09 +0200,
Takashi Sakamoto wrote:
> 
> This commit adds support for the hybrid model of MOTU Ultralite mk3 with
> alpha connector, which is already discontinued. The hardware specification
> of the model is the same as the one of FireWire-only model.
> 
> $ cd linux-firewire-utils
> $ python3 src/crpp < /sys/bus/firewire/devices/fw1/config_rom
>                ROM header and bus information block
>                -----------------------------------------------------------------
> 400  04101573  bus_info_length 4, crc_length 16, crc 5491
> 404  31333934  bus_name "1394"
> 408  20ff7000  irmc 0, cmc 0, isc 1, bmc 0, cyc_clk_acc 255, max_rec 7 (256)
> 40c  0001f200  company_id 0001f2     |
> 410  000a059c  device_id 00000a059c  | EUI-64 0001f200000a059c
> 
>                root directory
>                -----------------------------------------------------------------
> 414  0004ef04  directory_length 4, crc 61188
> 418  030001f2  vendor
> 41c  0c0083c0  node capabilities per IEEE 1394
> 420  d1000002  --> unit directory at 428
> 424  8d000005  --> eui-64 leaf at 438
> 
>                unit directory at 428
>                -----------------------------------------------------------------
> 428  0003f00b  directory_length 3, crc 61451
> 42c  120001f2  specifier id
> 430  13000030  version
> 434  17103800  model
> 
>                eui-64 leaf at 438
>                -----------------------------------------------------------------
> 438  0002d89c  leaf_length 2, crc 55452
> 43c  0001f200  company_id 0001f2     |
> 440  000a059c  device_id 00000a059c  | EUI-64 0001f200000a059c
> 
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Thanks, applied.


Takashi
diff mbox series

Patch

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index def1f3d5ecf5..fc6858131b59 100644
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -154,6 +154,8 @@  config SND_FIREWIRE_MOTU
 	  * 8pre
 	  * 828mk3 (FireWire only)
 	  * 828mk3 (Hybrid)
+	  * Ultralite mk3 (FireWire only)
+	  * Ultralite mk3 (Hybrid)
 	  * Audio Express
 	  * 4pre
 
diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c
index a4929c1302dc..2a8a6ea2d3f1 100644
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
@@ -190,6 +190,7 @@  static const struct ieee1394_device_id motu_id_table[] = {
 	SND_MOTU_DEV_ENTRY(0x00000f, &snd_motu_spec_8pre),
 	SND_MOTU_DEV_ENTRY(0x000015, &snd_motu_spec_828mk3), // FireWire only.
 	SND_MOTU_DEV_ENTRY(0x000019, &snd_motu_spec_ultralite_mk3), // FireWire only.
+	SND_MOTU_DEV_ENTRY(0x000030, &snd_motu_spec_ultralite_mk3), // Hybrid.
 	SND_MOTU_DEV_ENTRY(0x000035, &snd_motu_spec_828mk3), // Hybrid.
 	SND_MOTU_DEV_ENTRY(0x000033, &snd_motu_spec_audio_express),
 	SND_MOTU_DEV_ENTRY(0x000045, &snd_motu_spec_4pre),