From patchwork Sat Jan 4 17:13:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Geoffrey D. Bennett" X-Patchwork-Id: 13926322 Received: from m.b4.vu (m.b4.vu [203.16.231.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 339141C242C for ; Sat, 4 Jan 2025 17:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.16.231.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736010803; cv=none; b=ekomRn/m+Uh2tnk/PwjbaMbzJOY3SD3Lp1EaSmtIpOtn4186l4sTE4eWho9D/SyJcwwZn4jS67s25G6KBmMHhNu2IbZ9TEwhxav+GJmztQiwRkKhQ6oEqYw7CrL+cVmVwnmP8O2Xa2n1Axsf2Pm4rYbe0E+Isjfe7DthR8rh73o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736010803; c=relaxed/simple; bh=g9Y4M4s0GQu3ILho+7yEbrkac3+uwhE+ELeQ84R+Qh0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mShlrcNVaZydgT1iehw0Vha9lakqf4pG6RogVHD1K4PFdXbVOqIOz6jVWlw16lc46ouGrIRfg4lMe4UrlGNYbRiz/0bageRojew/7aeck5rTaN/RleAYXGs6DT5sDvuY535UNLbNdrXcPcnBNZ1yH4PPnyRJp9PTlVWQ987/VIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=b4.vu; spf=pass smtp.mailfrom=b4.vu; dkim=pass (2048-bit key) header.d=b4.vu header.i=@b4.vu header.b=QjwS48Lp; arc=none smtp.client-ip=203.16.231.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=b4.vu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=b4.vu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=b4.vu header.i=@b4.vu header.b="QjwS48Lp" Received: by m.b4.vu (Postfix, from userid 1000) id 6F8ED649815C; Sun, 5 Jan 2025 03:43:20 +1030 (ACDT) DKIM-Filter: OpenDKIM Filter v2.11.0 m.b4.vu 6F8ED649815C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=b4.vu; s=m1; t=1736010800; bh=I1c8cQW2h3IyL5mebxUFKL+d9rNVnhw0SGdH19EqGzI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QjwS48Lpf+kwGne6E18wL3oi07alKWbYzHmVI7/xw5sPX9Yp2Aql8eKym8wElWTY3 ZpJkfK/QbL3bViW4LxA6PtAmxGp5Fv9K3lCSaIlGSfTXKj4o1nMIU4A4jUC+iGXKIi Z+T3izW6Pu3f2tYmKqMoWwMY76kZOOO+epX49/S8WgyBzeWliiMrBVGvyjkCot+gs9 gwzUOUhmNh6TBmQRMkj1SbIKTEyiYTY2Krv4wV8Nprk3G5zK0qV2T8zGteRErYK/ij tipDnsVnB3eiIUHWiVXgOWQV+WGvwlvV3CDgwh2scpvknOZMK2xxVv5UKgfaOMkVan lJSdKjPkwBoaQ== Date: Sun, 5 Jan 2025 03:43:20 +1030 From: "Geoffrey D. Bennett" To: Takashi Iwai Cc: Takashi Iwai , linux-sound@vger.kernel.org Subject: [PATCH v4 2/2] ALSA: scarlett2: Add device_setup option to use FCP driver Message-ID: <6134c941e1a46c63c1c8830f468139b6c822c8a6.1736007881.git.g@b4.vu> References: Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Add a new device_setup option (SCARLETT2_USE_FCP_DRIVER = 0x08) that allows users to opt in to using the new FCP driver instead of the existing scarlett2 driver for their device. This provides a way to test the new FCP driver on existing supported hardware while keeping the Scarlett2 driver as the default. When the SCARLETT2_USE_FCP_DRIVER bit is set in device_setup, the scarlett2 driver initialisation will hand off to the FCP driver instead of proceeding with its own initialisation. The FCP driver then provides access to the device via its hwdep interface. Signed-off-by: Geoffrey D. Bennett --- sound/usb/mixer_scarlett2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c index 7f595c1752a5..288d22e6a0b2 100644 --- a/sound/usb/mixer_scarlett2.c +++ b/sound/usb/mixer_scarlett2.c @@ -166,6 +166,7 @@ #include "helper.h" #include "mixer_scarlett2.h" +#include "fcp.h" /* device_setup value to allow turning MSD mode back on */ #define SCARLETT2_MSD_ENABLE 0x02 @@ -173,6 +174,9 @@ /* device_setup value to disable this mixer driver */ #define SCARLETT2_DISABLE 0x04 +/* device_setup value to use the FCP driver instead */ +#define SCARLETT2_USE_FCP_DRIVER 0x08 + /* some gui mixers can't handle negative ctl values */ #define SCARLETT2_VOLUME_BIAS 127 @@ -9702,6 +9706,10 @@ int snd_scarlett2_init(struct usb_mixer_interface *mixer) if (!mixer->protocol) return 0; + /* check if the user wants to use the FCP driver instead */ + if (chip->setup & SCARLETT2_USE_FCP_DRIVER) + return snd_fcp_init(mixer); + /* find entry in scarlett2_devices */ entry = get_scarlett2_device_entry(mixer); if (!entry) {