From 343ff58001a848e274603d7809f2e27139e65c67 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 8 Aug 2021 08:37:46 +0900 Subject: [PATCH 1/4] hwdb: ieee1394-unit-function: correct entries for Phonic products Some of Phonic Firefly series and Helix Board series have the same combination of vendor ID, model ID, specifier ID, and software version in their configuration ROM. On the other hand, the other models have unique combination. ALSA bebob driver in Linux kernel v5.14 was changed in its modalias table for the models. This commit fixes systemd hwdb for the models. Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1586d461f641b60040438275e14c7dbcec5907d6 Signed-off-by: Takashi Sakamoto --- hwdb.d/80-ieee1394-unit-function.hwdb | 37 +++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index aa00711211..d38bccdaa8 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -330,8 +330,41 @@ ieee1394:ven00000FF2mo00010067sp0000A02Dver00010001 IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_VIDEO=0 -# Match to FireFly 202, 302, 808, and 808 Universal. -# Match to HelixBoard 12 mk II, 18 mk II, 24 mk II, 12 Universal, 18 Universal, and 24 Universal. +ieee1394:node:ven0x001496mo0x050000units0x00a02d:0x010001 +ieee1394:ven00001496mo00050000sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Phonic + ID_MODEL_FROM_DATABASE=Helixboard 12 FireWire MkII + IEEE1394_UNIT_FUNCTION_MIDI=1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +ieee1394:node:ven0x001496mo0x060000units0x00a02d:0x010001 +ieee1394:ven00001496mo00060000sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Phonic + ID_MODEL_FROM_DATABASE=Helixboard 18 FireWire MkII + IEEE1394_UNIT_FUNCTION_MIDI=1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +ieee1394:node:ven0x001496mo0x070000units0x00a02d:0x010001 +ieee1394:ven00001496mo00070000sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Phonic + ID_MODEL_FROM_DATABASE=Helixboard 24 FireWire MkII + IEEE1394_UNIT_FUNCTION_MIDI=1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +ieee1394:node:ven0x001496mo0x080000units0x00a02d:0x010001 +ieee1394:ven00001496mo00080000sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Phonic + ID_MODEL_FROM_DATABASE=Firefly 808 FireWire + IEEE1394_UNIT_FUNCTION_MIDI=1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +# Match to FireFly 202, 302, 808 Universal. +# Match to HelixBoard 12 FireWire, 18 FireWire, 24 FireWire. +# Match to HelixBoard 12 Universal, 18 Universal, and 24 Universal. ieee1394:node:ven0x001496mo0x000000units0x00a02d:0x010001 ieee1394:ven00001496mo00000000sp0000A02Dver00010001 ID_VENDOR_FROM_DATABASE=Phonic From 1ba328a1e6d306e510b4532e04c2a43dc1aef3b2 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 8 Aug 2021 08:37:46 +0900 Subject: [PATCH 2/4] hwdb: ieee1394-unit-function: correct comment for Mackie Onyx-i series Some Mackie Onyx-i models are known to have two revisions at least, which use different ASICS; Oxford Semiconductor FW971 and TC Applied Technologies TCD2210. I misunderstand that Onyx 1640i had not such revisions. This commit fixes comment to entry for the model. Signed-off-by: Takashi Sakamoto --- hwdb.d/80-ieee1394-unit-function.hwdb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index d38bccdaa8..8a0cbbb823 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -578,6 +578,7 @@ ieee1394:ven00000FF2mo00081216sp0000A02Dver00010001 IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_VIDEO=0 +# Match to former model of Onyx 1640i. ieee1394:node:ven0x000ff2mo0x001640units0x00a02d:0x010001 ieee1394:ven00000FF2mo00001640sp0000A02Dver00010001 ID_VENDOR_FROM_DATABASE=Loud Technologies @@ -740,7 +741,7 @@ ieee1394:ven00000FF2mo00000007sp00000FF2ver00000001 ID_MODEL_FROM_DATABASE=Mackie Onyx Blackbird IEEE1394_UNIT_FUNCTION_AUDIO=1 -# Match to Onyx 1640i, and latter models of Onyx 820i, 1220i, and 1620i. +# Match to latter models of Onyx 820i, 1220i, 1620i, and 1640i. ieee1394:node:ven0x000ff2mo0x000006units0x000ff2:0x000001 ieee1394:ven00000FF2mo00000006sp00000FF2ver00000001 ID_VENDOR_FROM_DATABASE=Loud Technologies From 15c04125a206835b1d724ae3b0ab9596a77ba115 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 8 Aug 2021 08:37:46 +0900 Subject: [PATCH 3/4] hwdb: ieee1394-unit-function: correct comment for Mackie d.2 and d.2 Pro I had misunderstanding that BridgeCo ASIC would be used for extension option for Mackie d.2 and OXFW971 would be used for Mackie d.2 Pro like Mackie d.4 Pro. However, it's clear that the latter is model with pre-installed option. This commit fixes commit to entry for Mackie d.2. I note that the modalias of unit of Mackie d.4 Pro is still unidentified. Signed-off-by: Takashi Sakamoto --- hwdb.d/80-ieee1394-unit-function.hwdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index 8a0cbbb823..c957f556df 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -322,7 +322,7 @@ ieee1394:ven00000FF2mo00010065sp0000A02Dver00010001 IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_VIDEO=0 -# An extension card for Mackie d.2. +# An extension card for Mackie d.2. Mackie d.2 Pro is preinstalled model. ieee1394:node:ven0x000ff2mo0x010067units0x00a02d:0x010001 ieee1394:ven00000FF2mo00010067sp0000A02Dver00010001 ID_VENDOR_FROM_DATABASE=Loud Technologies From 9f5c4c80d07040d558a784c011149775c4bb7f91 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 8 Aug 2021 08:37:46 +0900 Subject: [PATCH 4/4] hwdb: ieee1394-unit-function: correct entries for eAR Master One and Terratec Aureon 7.1 FireWire The configuration ROM of Acoustic Reality eAR Master One, Eroica, Figaro, and Ciaccona has OUI for TerraTec Electronic GmbH in its vendor ID field. As a result, modalias for the unit is the same as Terratec Electronic Aureon 7.1 FireWire. Linux FireWire subsystem adds the same modalias for units of the models. ALSA bebob driver had duplicated entries for them and was changed at Linux kernel v5.14 to remove the duplicated entries. It's better to improve corresponding entries in systemd hwdb, while it's impossible to distinguish the models by modalias and force to use the same entry for them. As last resort, this commit selects more popular model, Aureon 7.1 FireWire for ID_VENDOR_FROM_DATABASE and ID_MODEL_FROM_DATABASE. Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a07ebc7e050ccdfec508449b2ef8f2b2aa90927b Signed-off-by: Takashi Sakamoto --- hwdb.d/80-ieee1394-unit-function.hwdb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb index c957f556df..2f879da346 100644 --- a/hwdb.d/80-ieee1394-unit-function.hwdb +++ b/hwdb.d/80-ieee1394-unit-function.hwdb @@ -112,14 +112,6 @@ ieee1394:ven*sp0000A02Dver00000110 # BridgeCo. Enhancement BreakOut Box (BeBoB) for DM1000, DM1100, and DM1500 ASICs. # -# Match to eAR Master One, Eroica, Figaro, and Ciaccona. -ieee1394:node:ven0x000aacmo0x000002units0x00a02d:0x010001 -ieee1394:ven00000AACmo00000002sp0000A02Dver00010001 - ID_VENDOR_FROM_DATABASE=Acoustic Reality - ID_MODEL_FROM_DATABASE=eAR FireWire Audio - IEEE1394_UNIT_FUNCTION_AUDIO=1 - IEEE1394_UNIT_FUNCTION_VIDEO=0 - ieee1394:node:ven0x0003dbmo0x01eeeeunits0x00a02d:0x010001 ieee1394:ven000003DBmo0001EEEEsp0000A02Dver00010001 ID_VENDOR_FROM_DATABASE=Apogee Electronics @@ -419,6 +411,15 @@ ieee1394:ven00010065mo00010067sp0000A02Dver00010001 IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_VIDEO=0 +# Match to TerraTec Aureon 7.1 FireWire. +# Match to eAR Master One, Eroica, Figaro, and Ciaccona. OEM by TerraTec perhaps. +ieee1394:node:ven0x000aacmo0x000002units0x00a02d:0x010001 +ieee1394:ven00000AACmo00000002sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=TerraTec + ID_MODEL_FROM_DATABASE=Aureon 7.1 FireWire + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + ieee1394:node:ven0x000aacmo0x000003units0x00a02d:0x010001 ieee1394:ven00000AACmo00000003sp0000A02Dver00010001 ID_VENDOR_FROM_DATABASE=TerraTec Electronic