From patchwork Mon Jan 13 19:42:12 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: 13937970 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 8A59A19922A for ; Mon, 13 Jan 2025 19:42:14 +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=1736797336; cv=none; b=nXCRGZcklm9Vi1X17T02OQP2WKyqjJDuvihxIDtb3TFfZUC9rxkuZ8o7YwM2vJlHw1GJzdyAN33rTT9WW7n1Mn98SOPrCB53oF4P9+p4nFK/zftf2EMvdcqj4WB85cUEoazhex7Ri1ys59Bx4NTC+D4cb6qhkXwA5Dk5MAPbXBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736797336; 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=eR4oqslh5qCvZXIWeqHe6rLnOC+Nw5m/+VyUUiMBHXjtzBc/1uOxSs/MBzv9JzxpSipGDLB778XCVS/Q5etbiASwAT33GpPyfN4H7RlyhuWeqhSJcPdzTIMoxDe/R5jdr4ZsoIzaBq0QH27AYQ2xw1OzfXCl7AvCZCf4TTKEd3o= 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=WLK/RIxL; 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="WLK/RIxL" Received: by m.b4.vu (Postfix, from userid 1000) id B1709649F390; Tue, 14 Jan 2025 06:12:12 +1030 (ACDT) DKIM-Filter: OpenDKIM Filter v2.11.0 m.b4.vu B1709649F390 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=b4.vu; s=m1; t=1736797332; bh=I1c8cQW2h3IyL5mebxUFKL+d9rNVnhw0SGdH19EqGzI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WLK/RIxLzoZTPIhal+WSG3/lcCEhHMvUz7LIHLCKxJh5fTCDAkkxtBk1buxjL/WR8 hOwhtp8BW9E1Ggdzb9ClXq/6PkfbjYYaUkH5EB5UvdRGIK+G0oVzmGdcP7ac96lF6x a79uP+eM2bhlr0RqaU2mFIUj60OfofNjl4w1+Se5V2nfuxfqXJ271UfIzrHliOnvS1 W0u4Ll4/XahB/tj6EMPZwQ0Htfga9VIC/fxtN+bcSqjfvS8qzzSEhhePoJ50fWBNPF mhlZImI//IT2Rv3i7NAOXUzEFr89+rTfxiwkIN9rgSYcyGU7VmSuL/cob/if0PITIa TtmtptybIUKRg== Date: Tue, 14 Jan 2025 06:12:12 +1030 From: "Geoffrey D. Bennett" To: Takashi Iwai , Jaroslav Kysela Cc: Takashi Iwai , linux-sound@vger.kernel.org Subject: [PATCH v6 2/2] ALSA: scarlett2: Add device_setup option to use FCP driver Message-ID: 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) {