From 7760d8de3d44c0b6ffe9bd39460388fab4d1b2b9 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 17 Sep 2023 11:52:28 +0900 Subject: [PATCH 1/4] hwdb: ieee1394-unit-function: remove superfluous Weiss Engineering DAC1 entry Michele Perrone and Rolf Anderegg reported that their product with model_id 0x000005 was experimental for internal use and never for consumer market. * https://lore.kernel.org/alsa-devel/a5b63c37-7f6f-46f3-a87f-e4e7c0c9b5c8@weiss.ch/ This commit deletes corresponding entry. --- hwdb.d/80-ieee1394-unit-function.hwdb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index cf55f5524c..33bf7d93d8 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -912,12 +912,6 @@ ieee1394:ven00001C6Amo00000004sp00001C6Aver00000001 ID_MODEL_FROM_DATABASE=AFI1 IEEE1394_UNIT_FUNCTION_AUDIO=1 -ieee1394:node:ven0x001c6amo0x000005units0x001c6a:0x000001 -ieee1394:ven00001C6Amo00000005sp00001C6Aver00000001 - ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=DAC1 - IEEE1394_UNIT_FUNCTION_AUDIO=1 - ieee1394:node:ven0x001c6amo0x000006units0x001c6a:0x000001 ieee1394:ven00001C6Amo00000006sp00001C6Aver00000001 ID_VENDOR_FROM_DATABASE=Weiss Engineering From 042cfb896055f52a77b7d91156920ef4105b569d Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 17 Sep 2023 11:52:28 +0900 Subject: [PATCH 2/4] hwdb: ieee1394-unit-function: add Weiss Engineering DAC202 (Maya edition) Michele Perrone and Ralf Anderegg contribute to ALSA dice driver to support products of Weiss Engineering. Their patch includes support for DAC202 Maya edition. * https://lore.kernel.org/alsa-devel/24703333-9250-40bf-e736-a5f3c4862034@weiss.ch/ This commit fulfulls an entry for the model as well as supplemental comment to DAC2/Minerva. --- hwdb.d/80-ieee1394-unit-function.hwdb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index 33bf7d93d8..503f5bbc14 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -903,7 +903,7 @@ ieee1394:ven00001C6Amo00000002sp00001C6Aver00000001 ieee1394:node:ven0x001c6amo0x000003units0x001c6a:0x000001 ieee1394:ven00001C6Amo00000003sp00001C6Aver00000001 ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=Minerva + ID_MODEL_FROM_DATABASE=DAC2/Minerva IEEE1394_UNIT_FUNCTION_AUDIO=1 ieee1394:node:ven0x001c6amo0x000004units0x001c6a:0x000001 @@ -924,6 +924,12 @@ ieee1394:ven00001C6Amo00000007sp00001C6Aver00000001 ID_MODEL_FROM_DATABASE=DAC202 IEEE1394_UNIT_FUNCTION_AUDIO=1 +ieee1394:node:ven0x001c6amo0x000008units0x001c6a:0x000001 +ieee1394:ven00001C6Amo00000008sp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering + ID_MODEL_FROM_DATABASE=DAC202/Maya + IEEE1394_UNIT_FUNCTION_AUDIO=1 + # # Digidesign Digi00x family. # From 618edc0f566bf36843b32c9beb3dfa64db2371cf Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 17 Sep 2023 11:52:28 +0900 Subject: [PATCH 3/4] hwdb: ieee1394-unit-function: add Weiss Engineering INT203 entry with older firmware Michele Perrone reported that the model ID for INT203 with initial firmware is 0x00000a. * https://lore.kernel.org/alsa-devel/a5b63c37-7f6f-46f3-a87f-e4e7c0c9b5c8@weiss.ch/ This commit fulfills the entry corresponding to it as well as supplemental comment denoting to it. --- hwdb.d/80-ieee1394-unit-function.hwdb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index 503f5bbc14..bca410495a 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -912,10 +912,14 @@ ieee1394:ven00001C6Amo00000004sp00001C6Aver00000001 ID_MODEL_FROM_DATABASE=AFI1 IEEE1394_UNIT_FUNCTION_AUDIO=1 +# Starting from the middle of life time of INT203, the same firmware as +# INT202 is compatible. The firmware dynamically switches its functionality +# based on the state of internal jumper pins. Additionally, the design of +# FireWire option card for DAC1 is something like embedded-INT203. ieee1394:node:ven0x001c6amo0x000006units0x001c6a:0x000001 ieee1394:ven00001C6Amo00000006sp00001C6Aver00000001 ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=INT202 + ID_MODEL_FROM_DATABASE=INT202/INT203/DAC1 IEEE1394_UNIT_FUNCTION_AUDIO=1 ieee1394:node:ven0x001c6amo0x000007units0x001c6a:0x000001 @@ -930,6 +934,14 @@ ieee1394:ven00001C6Amo00000008sp00001C6Aver00000001 ID_MODEL_FROM_DATABASE=DAC202/Maya IEEE1394_UNIT_FUNCTION_AUDIO=1 +# The older version of firmware for INT203. Additionally, the design of +# FireWire option card for DAC1 is something like embedded-INT203. +ieee1394:node:ven0x001c6amo0x00000aunits0x001c6a:0x000001 +ieee1394:ven00001C6Amo0000000Asp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering + ID_MODEL_FROM_DATABASE=INT203/DAC1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + # # Digidesign Digi00x family. # From 56f62f6f5a4dde21f09bf27003cf3522de4d0a4e Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 17 Sep 2023 11:52:28 +0900 Subject: [PATCH 4/4] hwdb: ieee1394-unit-function: add Weiss Engieering MAN301 Michele Perrone contributes configuration ROM image for Weiss MAN301, which includes two units for 1394TA AV/C devices 1.0 and TCAT general protocol. * https://lore.kernel.org/alsa-devel/20230822135807.GA470519@workstation.local/ This commit adds hwdb entry for the model. --- hwdb.d/80-ieee1394-unit-function.hwdb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index bca410495a..d62a2dec4b 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -1399,3 +1399,19 @@ ieee1394:ven000001F2mo*sp000001F2ver00000024 ID_VENDOR_FROM_DATABASE=MOTU ID_MODEL_FROM_DATABASE=MOTU V4HD IEEE1394_UNIT_FUNCTION_VIDEO=1 + +# Weiss Engineering MAN301 (DICE application): unit 0: AV/C devices 1.0. +ieee1394:node:ven0x001c6amo0x00000bunits*0x00a02d:0x010001* +ieee1394:ven00001C6Amo0000000Bsp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering Ltd. + ID_MODEL_FROM_DATABASE=MAN301 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +# Weiss Engineering MAN301 (DICE application): unit 1: TCAT general protocol. +ieee1394:node:ven0x001c6amo0x00000bunits*0x001c6a:0x000001* +ieee1394:ven00001C6Amo0000000Bsp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering Ltd. + ID_MODEL_FROM_DATABASE=MAN301 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0