mbox series

[00/20] ALSA: scarlett2: Add support for Scarlett 4th Gen

Message ID cover.1703612638.git.g@b4.vu (mailing list archive)
Headers show
Series ALSA: scarlett2: Add support for Scarlett 4th Gen | expand

Message

Geoffrey D. Bennett Dec. 26, 2023, 6:05 p.m. UTC
Hi Takashi,

This patch series adds support for the Focusrite Scarlett 4th Gen
interfaces. It builds on top of the two previous patch series I sent:

- https://lore.kernel.org/linux-sound/cover.1703001053.git.g@b4.vu/
  ("ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements")

- https://lore.kernel.org/linux-sound/cover.1703444932.git.g@b4.vu/
  ("ALSA: scarlett2: Refactor in preparation for gen4")

I already sent patch #1 in this series below separately:
https://lore.kernel.org/linux-sound/ZYsBIE3DSKdi4YC%2F@m.b4.vu/
as it should go in to 6.7. I wasn't sure if I should include it again
here or not; sorry if I guessed wrong.

Patch #2 is a little cleanup I missed before sending the previous
series and would have gone there had I noticed.

Patches #3-18 add the new controls, etc. needed for the Gen 4 support.

Patch #19 adds the USB IDs and configuration data to enable support
for the new interfaces.

Patch #20 adds a last-minute new control that is only present on the
Solo Gen 4.

Regards,
Geoffrey.

Geoffrey D. Bennett (20):
  ALSA: scarlett2: Convert meter levels from little-endian
  ALSA: scarlett2: Remove repeated elem->head.mixer references
  ALSA: scarlett2: Add support for air/phantom control on input 2
  ALSA: scarlett2: Add support for Gen 4 style parameters
  ALSA: scarlett2: Allow for controls with a "mute mode"
  ALSA: scarlett2: Add support for Air Presence + Drive option
  ALSA: scarlett2: Add support for software-controllable input gain
  ALSA: scarlett2: Minor refactor MSD mode check
  ALSA: scarlett2: Disable input controls while autogain is running
  ALSA: scarlett2: Disable autogain during phantom power state change
  ALSA: scarlett2: Add power status control
  ALSA: scarlett2: Store mix_ctls for Gen 4 Direct Monitor
  ALSA: scarlett2: Handle Gen 4 Direct Monitor mix updates
  ALSA: scarlett2: Add support for custom Gen 4 Direct Monitor mixes
  ALSA: scarlett2: Add support for DSP mux channels
  ALSA: scarlett2: Rename DSP mux channels
  ALSA: scarlett2: Add minimum firmware version check
  ALSA: scarlett2: Add R/O headphone volume control
  ALSA: scarlett2: Add support for Solo, 2i2, and 4i4 Gen 4
  ALSA: scarlett2: Add PCM Input Switch for Solo Gen 4

 include/uapi/sound/scarlett2.h |    4 +-
 sound/usb/mixer_quirks.c       |    3 +
 sound/usb/mixer_scarlett2.c    | 2339 +++++++++++++++++++++++++++++++-
 3 files changed, 2279 insertions(+), 67 deletions(-)

Comments

Takashi Iwai Dec. 29, 2023, 3:06 p.m. UTC | #1
On Tue, 26 Dec 2023 19:05:43 +0100,
Geoffrey D. Bennett wrote:
> 
> Hi Takashi,
> 
> This patch series adds support for the Focusrite Scarlett 4th Gen
> interfaces. It builds on top of the two previous patch series I sent:
> 
> - https://lore.kernel.org/linux-sound/cover.1703001053.git.g@b4.vu/
>   ("ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements")
> 
> - https://lore.kernel.org/linux-sound/cover.1703444932.git.g@b4.vu/
>   ("ALSA: scarlett2: Refactor in preparation for gen4")
> 
> I already sent patch #1 in this series below separately:
> https://lore.kernel.org/linux-sound/ZYsBIE3DSKdi4YC%2F@m.b4.vu/
> as it should go in to 6.7. I wasn't sure if I should include it again
> here or not; sorry if I guessed wrong.
> 
> Patch #2 is a little cleanup I missed before sending the previous
> series and would have gone there had I noticed.
> 
> Patches #3-18 add the new controls, etc. needed for the Gen 4 support.
> 
> Patch #19 adds the USB IDs and configuration data to enable support
> for the new interfaces.
> 
> Patch #20 adds a last-minute new control that is only present on the
> Solo Gen 4.
> 
> Regards,
> Geoffrey.
> 
> Geoffrey D. Bennett (20):
>   ALSA: scarlett2: Convert meter levels from little-endian
>   ALSA: scarlett2: Remove repeated elem->head.mixer references
>   ALSA: scarlett2: Add support for air/phantom control on input 2
>   ALSA: scarlett2: Add support for Gen 4 style parameters
>   ALSA: scarlett2: Allow for controls with a "mute mode"
>   ALSA: scarlett2: Add support for Air Presence + Drive option
>   ALSA: scarlett2: Add support for software-controllable input gain
>   ALSA: scarlett2: Minor refactor MSD mode check
>   ALSA: scarlett2: Disable input controls while autogain is running
>   ALSA: scarlett2: Disable autogain during phantom power state change
>   ALSA: scarlett2: Add power status control
>   ALSA: scarlett2: Store mix_ctls for Gen 4 Direct Monitor
>   ALSA: scarlett2: Handle Gen 4 Direct Monitor mix updates
>   ALSA: scarlett2: Add support for custom Gen 4 Direct Monitor mixes
>   ALSA: scarlett2: Add support for DSP mux channels
>   ALSA: scarlett2: Rename DSP mux channels
>   ALSA: scarlett2: Add minimum firmware version check
>   ALSA: scarlett2: Add R/O headphone volume control
>   ALSA: scarlett2: Add support for Solo, 2i2, and 4i4 Gen 4
>   ALSA: scarlett2: Add PCM Input Switch for Solo Gen 4

Now applied to topic/scarlett2 branch (merged to for-next).

The first patch was already taken in for-linus branch for 6.7.


thanks,

Takashi