ALSA: usb-audio: Add infrastructure for TASCAM US-144MKII

This commit adds Kconfig and Makefile entries for TASCAM US-144MKII
USB audio/MIDI interface support. It includes the configuration option
and links new driver files.

The Kconfig entry for US-144MKII is added. The Makefile is updated to
compile new driver components.

The US-122L driver's device ID table is adjusted to remove the US-144MKII
entry, as it will now be handled by its dedicated driver.

Signed-off-by: Šerif Rami <ramiserifpersia@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250814172222.9448-8-ramiserifpersia@gmail.com

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 41c47301bc19c968906b57757b5dba1b9937e5b4..9b890abd96d34c2e8501d3b0c782ff1b89193fbd 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -117,6 +117,18 @@ config SND_USB_US122L
          To compile this driver as a module, choose M here: the module
          will be called snd-usb-us122l.
 
+config SND_USB_US144MKII
+       tristate "Tascam US-144MKII USB driver"
+       depends on X86 || COMPILE_TEST
+       select SND_RAWMIDI
+       select SND_PCM
+       help
+         Say Y here to include support for Tascam US-144MKII USB Audio/MIDI
+         interface.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-usb-us144mkii.
+
 config SND_USB_6FIRE
        tristate "TerraTec DMX 6Fire USB"
        select FW_LOADER

diff --git a/sound/usb/usx2y/Makefile b/sound/usb/usx2y/Makefile
index fc033aba03a4cd47b4f5c9ff16cb358e9030bd9c..9db87ae39ee9d4392b90995b2641d672670919a4 100644 (file)
--- a/sound/usb/usx2y/Makefile
+++ b/sound/usb/usx2y/Makefile
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 snd-usb-usx2y-y := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
 snd-usb-us122l-y := us122l.o
+snd-usb-us144mkii-y := us144mkii.o us144mkii_pcm.o us144mkii_playback.o us144mkii_capture.o us144mkii_midi.o us144mkii_controls.o
 
 obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o
 obj-$(CONFIG_SND_USB_US122L) += snd-usb-us122l.o
+obj-$(CONFIG_SND_USB_US144MKII) += snd-usb-us144mkii.o
\ No newline at end of file

diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 2ace3ba46091fdd17848b871cb4273658c8b5e8a..8dbbefe3e7306b5a76c0d07df9ec2d6c84e5c633 100644 (file)
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -686,12 +686,6 @@ static const struct usb_device_id snd_us122l_usb_id_table[] = {
                .idVendor =     0x0644,
                .idProduct =    USB_ID_US122MKII
        },
-       {
-               .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
-               .idVendor =     0x0644,
-               .idProduct =    USB_ID_US144MKII,
-               .driver_info =  US122L_FLAG_US144
-       },
        { /* terminator */ }
 };
 MODULE_DEVICE_TABLE(usb, snd_us122l_usb_id_table);