From 343ff58001a848e274603d7809f2e27139e65c67 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 8 Aug 2021 08:37:46 +0900 Subject: [PATCH] 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 aa007112112..d38bccdaa8e 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