- Alsa-devel - mailman.alsa-project.org

Re: [PATCH v2 5/5] dt-bindings: Drop Dan Murphy and Ricardo Rivera-Matos
by Jonathan Cameron 10 Aug '22

10 Aug '22

On Tue, 9 Aug 2022 19:27:52 +0300 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> wrote: > Emails to Dan Murphy and Ricardo Rivera-Matos bounce ("550 Invalid > recipient"). Andrew Davis agreed to take over the bindings. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> > > --- > > Changes since v1: > 1. Add Andrew Davis instead. > 2. Not adding accumulated ack due to change above. > --- > Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml | 2 +- > .../devicetree/bindings/leds/leds-class-multicolor.yaml | 2 +- > Documentation/devicetree/bindings/leds/leds-lp50xx.yaml | 2 +- > Documentation/devicetree/bindings/net/ti,dp83822.yaml | 2 +- > Documentation/devicetree/bindings/net/ti,dp83867.yaml | 2 +- > Documentation/devicetree/bindings/net/ti,dp83869.yaml | 2 +- > Documentation/devicetree/bindings/power/supply/bq2515x.yaml | 3 +-- > Documentation/devicetree/bindings/power/supply/bq256xx.yaml | 2 +- > Documentation/devicetree/bindings/power/supply/bq25980.yaml | 3 +-- > Documentation/devicetree/bindings/sound/tas2562.yaml | 2 +- > Documentation/devicetree/bindings/sound/tlv320adcx140.yaml | 2 +- > 11 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml b/Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml > index 9f5e96439c01..2e6abc9d746a 100644 > --- a/Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml > +++ b/Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml > @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: Texas Instruments' ads124s08 and ads124s06 ADC chip > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> For this one. Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> > > properties: > compatible: > diff --git a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml > index 12693483231f..31840e33dcf5 100644 > --- a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml > +++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml > @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: Common properties for the multicolor LED class. > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > Bindings for multi color LEDs show how to describe current outputs of > diff --git a/Documentation/devicetree/bindings/leds/leds-lp50xx.yaml b/Documentation/devicetree/bindings/leds/leds-lp50xx.yaml > index e0b658f07973..63da380748bf 100644 > --- a/Documentation/devicetree/bindings/leds/leds-lp50xx.yaml > +++ b/Documentation/devicetree/bindings/leds/leds-lp50xx.yaml > @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: LED driver for LP50XX RGB LED from Texas Instruments. > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The LP50XX is multi-channel, I2C RGB LED Drivers that can group RGB LEDs into > diff --git a/Documentation/devicetree/bindings/net/ti,dp83822.yaml b/Documentation/devicetree/bindings/net/ti,dp83822.yaml > index 75e8712e903a..f2489a9c852f 100644 > --- a/Documentation/devicetree/bindings/net/ti,dp83822.yaml > +++ b/Documentation/devicetree/bindings/net/ti,dp83822.yaml > @@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" > title: TI DP83822 ethernet PHY > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The DP83822 is a low-power, single-port, 10/100 Mbps Ethernet PHY. It > diff --git a/Documentation/devicetree/bindings/net/ti,dp83867.yaml b/Documentation/devicetree/bindings/net/ti,dp83867.yaml > index 76ff08a477ba..b8c0e4b5b494 100644 > --- a/Documentation/devicetree/bindings/net/ti,dp83867.yaml > +++ b/Documentation/devicetree/bindings/net/ti,dp83867.yaml > @@ -11,7 +11,7 @@ allOf: > - $ref: "ethernet-controller.yaml#" > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The DP83867 device is a robust, low power, fully featured Physical Layer > diff --git a/Documentation/devicetree/bindings/net/ti,dp83869.yaml b/Documentation/devicetree/bindings/net/ti,dp83869.yaml > index 1b780dce61ab..b04ff0014a59 100644 > --- a/Documentation/devicetree/bindings/net/ti,dp83869.yaml > +++ b/Documentation/devicetree/bindings/net/ti,dp83869.yaml > @@ -11,7 +11,7 @@ allOf: > - $ref: "ethernet-phy.yaml#" > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The DP83869HM device is a robust, fully-featured Gigabit (PHY) transceiver > diff --git a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml > index 27db38577822..1a1b240034ef 100644 > --- a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml > +++ b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml > @@ -8,8 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: TI bq2515x 500-mA Linear charger family > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > - - Ricardo Rivera-Matos <r-rivera-matos(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The BQ2515x family is a highly integrated battery charge management IC that > diff --git a/Documentation/devicetree/bindings/power/supply/bq256xx.yaml b/Documentation/devicetree/bindings/power/supply/bq256xx.yaml > index 91abe5733c41..82f382a7ffb3 100644 > --- a/Documentation/devicetree/bindings/power/supply/bq256xx.yaml > +++ b/Documentation/devicetree/bindings/power/supply/bq256xx.yaml > @@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: TI bq256xx Switch Mode Buck Charger > > maintainers: > - - Ricardo Rivera-Matos <r-rivera-matos(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The bq256xx devices are a family of highly-integrated battery charge > diff --git a/Documentation/devicetree/bindings/power/supply/bq25980.yaml b/Documentation/devicetree/bindings/power/supply/bq25980.yaml > index 4883527ab5c7..b687b8bcd705 100644 > --- a/Documentation/devicetree/bindings/power/supply/bq25980.yaml > +++ b/Documentation/devicetree/bindings/power/supply/bq25980.yaml > @@ -8,8 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: TI BQ25980 Flash Charger > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > - - Ricardo Rivera-Matos <r-rivera-matos(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The BQ25980, BQ25975, and BQ25960 are a series of flash chargers intended > diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml > index 5f7dd5d6cbca..30f6b029ac08 100644 > --- a/Documentation/devicetree/bindings/sound/tas2562.yaml > +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml > @@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" > title: Texas Instruments TAS2562 Smart PA > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The TAS2562 is a mono, digital input Class-D audio amplifier optimized for > diff --git a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml > index bc2fb1a80ed7..ee698614862e 100644 > --- a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml > +++ b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml > @@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# > title: Texas Instruments TLV320ADCX140 Quad Channel Analog-to-Digital Converter > > maintainers: > - - Dan Murphy <dmurphy(a)ti.com> > + - Andrew Davis <afd(a)ti.com> > > description: | > The TLV320ADCX140 are multichannel (4-ch analog recording or 8-ch digital

1 0

[PATCH] aplay: Add support for G711 A law on .au files
by Christophe Leroy 10 Aug '22

10 Aug '22

.au files support G711 A law as well. Add it to aplay. Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- aplay/aplay.c | 9 +++++++++ aplay/formats.h | 1 + 2 files changed, 10 insertions(+) diff --git a/aplay/aplay.c b/aplay/aplay.c index 6ce7191..c004bf9 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -1210,6 +1210,12 @@ static int test_au(int fd, void *buffer) fprintf(stderr, _("Warning: format is changed to S16_BE\n")); hwparams.format = SND_PCM_FORMAT_S16_BE; break; + case AU_FMT_ALAW: + if (hwparams.format != DEFAULT_FORMAT && + hwparams.format != SND_PCM_FORMAT_A_LAW) + fprintf(stderr, _("Warning: format is changed to A_LAW\n")); + hwparams.format = SND_PCM_FORMAT_A_LAW; + break; default: return -1; } @@ -2735,6 +2741,9 @@ static void begin_au(int fd, size_t cnt) case SND_PCM_FORMAT_S16_BE: ah.encoding = BE_INT(AU_FMT_LIN16); break; + case SND_PCM_FORMAT_A_LAW: + ah.encoding = BE_INT(AU_FMT_ALAW); + break; default: error(_("Sparc Audio doesn't support %s format..."), snd_pcm_format_name(hwparams.format)); prg_exit(EXIT_FAILURE); diff --git a/aplay/formats.h b/aplay/formats.h index ac0a2b0..cbc99fe 100644 --- a/aplay/formats.h +++ b/aplay/formats.h @@ -121,6 +121,7 @@ typedef struct { #define AU_FMT_ULAW 1 #define AU_FMT_LIN8 2 #define AU_FMT_LIN16 3 +#define AU_FMT_ALAW 27 typedef struct au_header { u_int magic; /* '.snd' */ -- 2.37.1

1 0

[PATCH] ASoC: rt5640: Fix the JD voltage dropping issue
by Oder Chiou 09 Aug '22

09 Aug '22

The patch fixes the JD voltage dropping issue in the HDA JD using. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> Reported-by: Mohan Kumar D <mkumard(a)nvidia.com> --- sound/soc/codecs/rt5640.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 38ab8d4291c..5a844329800 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1986,7 +1986,7 @@ static int rt5640_set_bias_level(struct snd_soc_component *component, snd_soc_component_write(component, RT5640_PWR_MIXER, 0x0000); if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) snd_soc_component_write(component, RT5640_PWR_ANLG1, - 0x0018); + 0x2818); else snd_soc_component_write(component, RT5640_PWR_ANLG1, 0x0000); @@ -2600,7 +2600,8 @@ static void rt5640_enable_hda_jack_detect( snd_soc_component_update_bits(component, RT5640_DUMMY1, 0x400, 0x0); snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, - RT5640_PWR_VREF2, RT5640_PWR_VREF2); + RT5640_PWR_VREF2 | RT5640_PWR_MB | RT5640_PWR_BG, + RT5640_PWR_VREF2 | RT5640_PWR_MB | RT5640_PWR_BG); usleep_range(10000, 15000); snd_soc_component_update_bits(component, RT5640_PWR_ANLG1, RT5640_PWR_FV2, RT5640_PWR_FV2); -- 2.34.1

2 1

[PATCH 0/5] iio/hwmon/mfd/leds/net/power/ASoC: dt-bindings: few stale maintainers cleanup
by Krzysztof Kozlowski 09 Aug '22

09 Aug '22

Hi, A question: Several of the bindings here had only one maintainer and history does not always point to a new one (although I did not perform extensive digging). I added subsystem maintainer, because dtschema requires such entry. This is not the best choice as simply subsystem maintainer might not have the actual device (or its datasheets or any interest in it). However dtschema requires a maintainer. Maybe we could add some "orphaned" entry in such case? Best regards, Krzysztof Krzysztof Kozlowski (5): dt-bindings: iio: Drop Joachim Eastwood dt-bindings: iio: Drop Bogdan Pricop dt-bindings: Drop Beniamin Bia and Stefan Popa dt-bindings: Drop Robert Jones dt-bindings: Drop Dan Murphy Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml | 1 - Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml | 1 - Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml | 3 +-- Documentation/devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/ti,adc108s102.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml | 2 +- .../devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml | 1 - Documentation/devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 2 +- .../devicetree/bindings/leds/leds-class-multicolor.yaml | 2 +- Documentation/devicetree/bindings/leds/leds-lp50xx.yaml | 2 +- Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml | 1 - Documentation/devicetree/bindings/net/ti,dp83822.yaml | 2 +- Documentation/devicetree/bindings/net/ti,dp83867.yaml | 2 +- Documentation/devicetree/bindings/net/ti,dp83869.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq2515x.yaml | 1 - Documentation/devicetree/bindings/power/supply/bq25980.yaml | 1 - Documentation/devicetree/bindings/sound/tas2562.yaml | 2 +- Documentation/devicetree/bindings/sound/tlv320adcx140.yaml | 2 +- 19 files changed, 13 insertions(+), 20 deletions(-) -- 2.34.1

5 16

Re: [PATCH 0/5] iio/hwmon/mfd/leds/net/power/ASoC: dt-bindings: few stale maintainers cleanup
by Jakub Kicinski 09 Aug '22

09 Aug '22

On Tue, 9 Aug 2022 08:25:29 +0300 Krzysztof Kozlowski wrote: > On 08/08/2022 21:52, Jakub Kicinski wrote: > > Integrating it with MAINTAINERS would be another option worth exploring > > although slightly tangential. > > > > How do you want this merged? It's all over the place subsystem-wise. > > I was thinking this could go via Rob's tree as fixes for current cycle, > so your Ack would be great Sounds good!

1 0

[PATCH] ALSA: usb-audio: make read-only array marker static const
by Colin Ian King 09 Aug '22

09 Aug '22

Don't populate the read-only array marker on the stack but instead make it static const. Also makes the object code a little smaller. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/usb/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index e692ae04436a..d45d1d7e6664 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1269,7 +1269,7 @@ static inline void fill_playback_urb_dsd_dop(struct snd_usb_substream *subs, unsigned int wrap = subs->buffer_bytes; u8 *dst = urb->transfer_buffer; u8 *src = runtime->dma_area; - u8 marker[] = { 0x05, 0xfa }; + static const u8 marker[] = { 0x05, 0xfa }; unsigned int queued = 0; /* -- 2.35.3

1 0

Behringer UMC204HD audio delay
by GitHub issues - opened 09 Aug '22

09 Aug '22

alsa-project/alsa-ucm-conf issue #198 was opened from vostok01: After update from 1.2.6.3 to 1.2.7.2, there was a desynchronization of audio and video. The sound is delayed by about 400 ms. Sometimes the out-of-sync disappears, but then it reappears. The sound is output via pulseaudio. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/198 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Re: [PATCH v2 5/5] dt-bindings: Drop Dan Murphy and Ricardo Rivera-Matos
by Andrew Davis 09 Aug '22

09 Aug '22

On 8/9/22 11:27 AM, Krzysztof Kozlowski wrote: > Emails to Dan Murphy and Ricardo Rivera-Matos bounce ("550 Invalid > recipient"). Andrew Davis agreed to take over the bindings. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> > > --- Acked-by: Andrew Davis <afd(a)ti.com>

1 0

[PATCH] ALSA: hda/realtek: Add a quirk for HP OMEN 15 (8786) mute LED
by Bedant 09 Aug '22

09 Aug '22

From: Bedant Patnaik <bedant.patnaik(a)gmail.com> Board ID 8786 seems to be another variant of the Omen 15 that needs ALC285_FIXUP_HP_MUTE_LED for working mute LED. Signed-off-by: Bedant Patnaik <bedant.patnaik(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8a57636f6..258f4e490 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9203,6 +9203,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { ALC285_FIXUP_HP_GPIO_AMP_INIT), SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8786, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x8787, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED), -- 2.37.1

2 1

[PATCH] ALSA: scarlett2: Add Focusrite Clarett+ 8Pre support
by Geoffrey D. Bennett 09 Aug '22

09 Aug '22

From: Christian Colglazier <christian(a)cacolglazier.com> The Focusrite Clarett+ 8Pre uses the same protocol as the Scarlett Gen 2 and Gen 3 product range. This patch adds support for the Clarett+ 8Pre by adding appropriate entries to the scarlett2 driver. The Clarett+ 2Pre and 4Pre, and the Clarett USB product line presumably use the same protocol as well, so support for them can easily be added if someone can test. Signed-off-by: Christian Colglazier <christian(a)cacolglazier.com> Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- sound/usb/mixer_quirks.c | 1 + sound/usb/mixer_scarlett_gen2.c | 91 ++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index d35cf54cab33..4a6ee50f69c4 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3238,6 +3238,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) case USB_ID(0x1235, 0x8213): /* Focusrite Scarlett 8i6 3rd Gen */ case USB_ID(0x1235, 0x8214): /* Focusrite Scarlett 18i8 3rd Gen */ case USB_ID(0x1235, 0x8215): /* Focusrite Scarlett 18i20 3rd Gen */ + case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */ err = snd_scarlett_gen2_init(mixer); break; diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 69a2cd429ee2..9d11bb08667e 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -1,13 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Focusrite Scarlett Gen 2/3 Driver for ALSA + * Focusrite Scarlett Gen 2/3 and Clarett+ Driver for ALSA * * Supported models: * - 6i6/18i8/18i20 Gen 2 * - Solo/2i2/4i4/8i6/18i8/18i20 Gen 3 + * - Clarett+ 8Pre * * Copyright (c) 2018-2022 by Geoffrey D. Bennett <g at b4.vu> * Copyright (c) 2020-2021 by Vladimir Sadovnikov <sadko4u(a)gmail.com> + * Copyright (c) 2022 by Christian Colglazier <christian(a)cacolglazier.com> * * Based on the Scarlett (Gen 1) Driver for ALSA: * @@ -51,6 +53,9 @@ * Support for phantom power, direct monitoring, speaker switching, * and talkback added in May-June 2021. * + * Support for Clarett+ 8Pre added in Aug 2022 by Christian + * Colglazier. + * * This ALSA mixer gives access to (model-dependent): * - input, output, mixer-matrix muxes * - mixer-matrix gain stages @@ -203,7 +208,8 @@ enum { SCARLETT2_CONFIG_SET_NO_MIXER = 0, SCARLETT2_CONFIG_SET_GEN_2 = 1, SCARLETT2_CONFIG_SET_GEN_3 = 2, - SCARLETT2_CONFIG_SET_COUNT = 3 + SCARLETT2_CONFIG_SET_CLARETT = 3, + SCARLETT2_CONFIG_SET_COUNT = 4 }; /* Hardware port types: @@ -841,6 +847,61 @@ static const struct scarlett2_device_info s18i20_gen3_info = { } }, }; +static const struct scarlett2_device_info clarett_8pre_info = { + .usb_id = USB_ID(0x1235, 0x820c), + + .config_set = SCARLETT2_CONFIG_SET_CLARETT, + .line_out_hw_vol = 1, + .level_input_count = 2, + .air_input_count = 8, + + .line_out_descrs = { + "Monitor L", + "Monitor R", + NULL, + NULL, + NULL, + NULL, + "Headphones 1 L", + "Headphones 1 R", + "Headphones 2 L", + "Headphones 2 R", + }, + + .port_count = { + [SCARLETT2_PORT_TYPE_NONE] = { 1, 0 }, + [SCARLETT2_PORT_TYPE_ANALOGUE] = { 8, 10 }, + [SCARLETT2_PORT_TYPE_SPDIF] = { 2, 2 }, + [SCARLETT2_PORT_TYPE_ADAT] = { 8, 8 }, + [SCARLETT2_PORT_TYPE_MIX] = { 10, 18 }, + [SCARLETT2_PORT_TYPE_PCM] = { 20, 18 }, + }, + + .mux_assignment = { { + { SCARLETT2_PORT_TYPE_PCM, 0, 18 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 10 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_ADAT, 0, 8 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 14 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 10 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_ADAT, 0, 4 }, + { SCARLETT2_PORT_TYPE_MIX, 0, 18 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 8 }, + { 0, 0, 0 }, + }, { + { SCARLETT2_PORT_TYPE_PCM, 0, 12 }, + { SCARLETT2_PORT_TYPE_ANALOGUE, 0, 10 }, + { SCARLETT2_PORT_TYPE_SPDIF, 0, 2 }, + { SCARLETT2_PORT_TYPE_NONE, 0, 22 }, + { 0, 0, 0 }, + } }, +}; + static const struct scarlett2_device_info *scarlett2_devices[] = { /* Supported Gen 2 devices */ &s6i6_gen2_info, @@ -855,6 +916,9 @@ static const struct scarlett2_device_info *scarlett2_devices[] = { &s18i8_gen3_info, &s18i20_gen3_info, + /* Supported Clarett+ devices */ + &clarett_8pre_info, + /* End of list */ NULL }; @@ -1047,6 +1111,29 @@ static const struct scarlett2_config [SCARLETT2_CONFIG_TALKBACK_MAP] = { .offset = 0xb0, .size = 16, .activate = 10 }, + +/* Clarett+ 8Pre */ +}, { + [SCARLETT2_CONFIG_DIM_MUTE] = { + .offset = 0x31, .size = 8, .activate = 2 }, + + [SCARLETT2_CONFIG_LINE_OUT_VOLUME] = { + .offset = 0x34, .size = 16, .activate = 1 }, + + [SCARLETT2_CONFIG_MUTE_SWITCH] = { + .offset = 0x5c, .size = 8, .activate = 1 }, + + [SCARLETT2_CONFIG_SW_HW_SWITCH] = { + .offset = 0x66, .size = 8, .activate = 3 }, + + [SCARLETT2_CONFIG_LEVEL_SWITCH] = { + .offset = 0x7c, .size = 8, .activate = 7 }, + + [SCARLETT2_CONFIG_AIR_SWITCH] = { + .offset = 0x95, .size = 8, .activate = 8 }, + + [SCARLETT2_CONFIG_STANDALONE_SWITCH] = { + .offset = 0x8d, .size = 8, .activate = 6 }, } }; /* proprietary request/response format */ -- 2.37.1

2 1