Commit 83ce1c75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This became slightly big partly due to my time off in the last week.
  But all changes are about device-specific fixes, so it should be
  safely applicable.

  ASoC:
   - Fix double free in sma1307
   - Fix uninitialized variables in simple-card-utils/imx-card
   - Address clock leaks and error propagation in ADAU1372
   - Add DMI quirks and ACP/SDW support for ASUS
   - Fix Intel CATPT DMA mask
   - Fix SOF topology parsing
   - Fix DT bindings for RK3576 SPDIF, STM32 SAI and WCD934x

  HD-audio:
   - Quirks for Lenovo, ASUS, and various HP models, as well as
     a speaker pop fix on Star Labs StarFighter
   - Revert MSI X870E Tomahawk denylist again

  USB-Audio:
   - Fix distorted audio on Focusrite Scarlett 2i2/2i4 1st Gen
   - Add iface reset quirk for AB17X
   - Update Qualcomm USB audio Kconfig dependencies and license

  Misc:
   - Fix minor compile warnings for firewire and asihpi drivers"

* tag 'sound-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
  Revert "ALSA: hda/intel: Add MSI X870E Tomahawk to denylist"
  ALSA: usb-audio: Add iface reset and delay quirk for AB17X USB Audio
  ALSA: hda/realtek: add HP Laptop 15-fd0xxx mute LED quirk
  ALSA: usb-audio: Exclude Scarlett 2i4 1st Gen from SKIP_IFACE_SETUP
  ALSA: hda/realtek: Add mute LED quirk for HP Pavilion 15-eg0xxx
  ALSA: hda/realtek - Fixed Speaker Mute LED for HP EliteBoard G1a platform
  ASoC: SOF: ipc4-topology: Allow bytes controls without initial payload
  ASoC: adau1372: Fix clock leak on PLL lock failure
  ASoC: adau1372: Fix unchecked clk_prepare_enable() return value
  ASoC: SDCA: fix finding wrong entity
  ASoC: SDCA: remove the max count of initialization table
  ASoC: codecs: wcd934x: fix typo in dt parsing
  ASoC: dt-bindings: stm32: Fix incorrect compatible string in stm32h7-sai match
  ASoC: Intel: catpt: Fix the device initialization
  ASoC: amd: acp: add ASUS HN7306EA quirk for legacy SDW machine
  ASoC: SOF: topology: reject invalid vendor array size in token parser
  ASoC: tas2781: Add null check for calibration data
  ALSA: asihpi: avoid write overflow check warning
  ASoC: fsl: imx-card: initialize playback_only and capture_only
  ASoC: simple-card-utils: Check value of is_playback_only and is_capture_only
  ...
parents f44c6511 ed4da361

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - const: rockchip,rk3066-spdif

      - items:

          - enum:

              - rockchip,rk3576-spdif

              - rockchip,rk3588-spdif

          - const: rockchip,rk3568-spdif

Documentation/devicetree/bindings/sound/st,stm32-sai.yaml

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ allOf: 
      properties:

        compatible:

          contains:

            const: st,stm32mph7-sai

            const: st,stm32h7-sai

    then:

      properties:

        clocks:

include/sound/sdca_function.h

+0 −5
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ struct sdca_function_desc; 
 */

#define SDCA_MAX_ENTITY_COUNT 128



/*

 * Sanity check on number of initialization writes, can be expanded if needed.

 */

#define SDCA_MAX_INIT_COUNT 2048



/*

 * The Cluster IDs are 16-bit, so a maximum of 65535 Clusters per

 * function can be represented, however limit this to a slightly

sound/firewire/amdtp-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static void process_rx_packets(struct fw_iso_context *context, u32 tstamp, size_ 
	struct pkt_desc *desc = s->packet_descs_cursor;

	unsigned int pkt_header_length;

	unsigned int packets;

	u32 curr_cycle_time;

	u32 curr_cycle_time = 0;

	bool need_hw_irq;

	int i;

sound/hda/codecs/realtek/alc269.c

+59 −7
Original line number Diff line number Diff line
@@ -1017,12 +1017,30 @@ static int alc269_resume(struct hda_codec *codec) 
	return 0;

}



#define STARLABS_STARFIGHTER_SHUTUP_DELAY_MS	30

#define ALC233_STARFIGHTER_SPK_PIN	0x1b

#define ALC233_STARFIGHTER_GPIO2	0x04



static void starlabs_starfighter_shutup(struct hda_codec *codec)

static void alc233_starfighter_update_amp(struct hda_codec *codec, bool on)

{

	if (snd_hda_gen_shutup_speakers(codec))

		msleep(STARLABS_STARFIGHTER_SHUTUP_DELAY_MS);

	snd_hda_codec_write(codec, ALC233_STARFIGHTER_SPK_PIN, 0,

			    AC_VERB_SET_EAPD_BTLENABLE,

			    on ? AC_EAPDBTL_EAPD : 0);

	alc_update_gpio_data(codec, ALC233_STARFIGHTER_GPIO2, on);

}



static void alc233_starfighter_pcm_hook(struct hda_pcm_stream *hinfo,

					struct hda_codec *codec,

					struct snd_pcm_substream *substream,

					int action)

{

	switch (action) {

	case HDA_GEN_PCM_ACT_PREPARE:

		alc233_starfighter_update_amp(codec, true);

		break;

	case HDA_GEN_PCM_ACT_CLEANUP:

		alc233_starfighter_update_amp(codec, false);

		break;

	}

}



static void alc233_fixup_starlabs_starfighter(struct hda_codec *codec,
@@ -1031,8 +1049,16 @@ static void alc233_fixup_starlabs_starfighter(struct hda_codec *codec, 
{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->shutup = starlabs_starfighter_shutup;

	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->gpio_mask |= ALC233_STARFIGHTER_GPIO2;

		spec->gpio_dir |= ALC233_STARFIGHTER_GPIO2;

		spec->gpio_data &= ~ALC233_STARFIGHTER_GPIO2;

		break;

	case HDA_FIXUP_ACT_PROBE:

		spec->gen.pcm_playback_hook = alc233_starfighter_pcm_hook;

		break;

	}

}



static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
@@ -3699,21 +3725,41 @@ static void alc245_tas2781_spi_hp_fixup_muteled(struct hda_codec *codec, 
	alc_fixup_hp_gpio_led(codec, action, 0x04, 0x0);

	alc285_fixup_hp_coef_micmute_led(codec, fix, action);

}



static void alc245_hp_spk_mute_led_update(void *private_data, int enabled)

{

	struct hda_codec *codec = private_data;

	unsigned int val;



	val = enabled ? 0x08 : 0x04; /* 0x08 led on, 0x04 led off */

	alc_update_coef_idx(codec, 0x0b, 0x0c, val);

}



/* JD2: mute led GPIO3: micmute led */

static void alc245_tas2781_i2c_hp_fixup_muteled(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;

	hda_nid_t hp_pin = alc_get_hp_pin(spec);

	static const hda_nid_t conn[] = { 0x02 };



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		if (!hp_pin) {

			spec->gen.vmaster_mute.hook = alc245_hp_spk_mute_led_update;

			spec->gen.vmaster_mute_led = 1;

		}

		spec->gen.auto_mute_via_amp = 1;

		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

		break;

	case HDA_FIXUP_ACT_INIT:

		if (!hp_pin)

			alc245_hp_spk_mute_led_update(codec, !spec->gen.master_mute);

		break;

	}



	tas2781_fixup_txnw_i2c(codec, fix, action);

	if (hp_pin)

		alc245_fixup_hp_mute_led_coefbit(codec, fix, action);

	alc285_fixup_hp_coef_micmute_led(codec, fix, action);

}
@@ -6854,6 +6900,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8730, "HP ProBook 445 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8735, "HP ProBook 435 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8756, "HP ENVY Laptop 13-ba0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),

	SND_PCI_QUIRK(0x103c, 0x8760, "HP EliteBook 8{4,5}5 G7", ALC285_FIXUP_HP_BEEP_MICMUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x876e, "HP ENVY x360 Convertible 13-ay0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),

	SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
@@ -6867,6 +6914,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87cb, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87cc, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
@@ -7098,6 +7146,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8da7, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8da8, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8dd4, "HP EliteStudio 8 AIO", ALC274_FIXUP_HP_AIO_BIND_DACS),

	SND_PCI_QUIRK(0x103c, 0x8dd7, "HP Laptop 15-fd0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x8de8, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8de9, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8dec, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED),
@@ -7177,6 +7226,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x1194, "ASUS UM3406KA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	HDA_CODEC_QUIRK(0x1043, 0x1204, "ASUS Strix G16 G615JMR", ALC287_FIXUP_TXNW2781_I2C_ASUS),

	SND_PCI_QUIRK(0x1043, 0x1204, "ASUS Strix G615JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x1214, "ASUS Strix G615LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x125e, "ASUS Q524UQK", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -7206,6 +7256,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS G513PI/PU/PV", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x14f2, "ASUS VivoBook X515JA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1503, "ASUS G733PY/PZ/PZV/PYV", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1514, "ASUS ROG Flow Z13 GZ302EAC", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x1533, "ASUS GV302XA/XJ/XQ/XU/XV/XI", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301VV/VQ/VU/VJ/VA/VC/VE/VVC/VQC/VUC/VJC/VEC/VCC", ALC285_FIXUP_ASUS_HEADSET_MIC),
@@ -7575,6 +7626,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38b4, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),

	HDA_CODEC_QUIRK(0x17aa, 0x391c, "Lenovo Yoga 7 2-in-1 14AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	HDA_CODEC_QUIRK(0x17aa, 0x391d, "Lenovo Yoga 7 2-in-1 16AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x38b5, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x38b6, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x38b7, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),