Commit bbcb2cd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A bunch of small device-specific fixes. Mostly quirks and fix-ups for
  USB- and HD-audio at this time, in addition to a couple of ASoC AMD
  and Cirrus fixes"

* tag 'sound-7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ASoC: SDCA: Fix comments for sdca_irq_request()
  ALSA: us144mkii: Drop kernel-doc markers
  ALSA: usb: qcom: Correct parameter comment for uaudio_transfer_buffer_setup()
  ALSA: usb-audio: Drop superfluous kernel-doc markers
  ALSA: hda: cs35l56: Remove unnecessary struct cs_dsp_client_ops
  ALSA: hda: cs35l56: Fix signedness error in cs35l56_hda_posture_put()
  ALSA: usb-audio: Use correct version for UAC3 header validation
  ALSA: hda/realtek: add quirk for Acer Nitro ANV15-51
  ALSA: hda/intel: increase default bdl_pos_adj for Nvidia controllers
  ALSA: usb-audio: Use inclusive terms
  ALSA: usb-audio: Avoid implicit feedback mode on DIYINHK USB Audio 2.0
  ALSA: usb-audio: Check max frame size for implicit feedback mode, too
  ALSA: usb-audio: Cap the packet size pre-calculations
  ASoC: amd: yc: Add ASUS EXPERTBOOK BM1503CDA to quirk table
  ASoC: cs42l43: Report insert for exotic peripherals
  ALSA: usb-audio: Skip clock selector for Focusrite devices
  ALSA: usb-audio: Add QUIRK_FLAG_SKIP_IFACE_SETUP
  ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
  ALSA: usb-audio: Improve Focusrite sample rate filtering
  ALSA: hda/realtek: add quirk for Samsung Galaxy Book Flex (NT950QCT-A38A)
  ...
parents 466d6175 71c1978a

sound/hda/codecs/realtek/alc269.c

+36 −1
Original line number Diff line number Diff line
@@ -1017,6 +1017,24 @@ static int alc269_resume(struct hda_codec *codec) 
	return 0;

}



#define STARLABS_STARFIGHTER_SHUTUP_DELAY_MS	30



static void starlabs_starfighter_shutup(struct hda_codec *codec)

{

	if (snd_hda_gen_shutup_speakers(codec))

		msleep(STARLABS_STARFIGHTER_SHUTUP_DELAY_MS);

}



static void alc233_fixup_starlabs_starfighter(struct hda_codec *codec,

					      const struct hda_fixup *fix,

					      int action)

{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->shutup = starlabs_starfighter_shutup;

}



static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,

						 const struct hda_fixup *fix, int action)

{
@@ -4040,6 +4058,7 @@ enum { 
	ALC245_FIXUP_CLEVO_NOISY_MIC,

	ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE,

	ALC233_FIXUP_MEDION_MTL_SPK,

	ALC233_FIXUP_STARLABS_STARFIGHTER,

	ALC294_FIXUP_BASS_SPEAKER_15,

	ALC283_FIXUP_DELL_HP_RESUME,

	ALC294_FIXUP_ASUS_CS35L41_SPI_2,
@@ -4056,6 +4075,7 @@ enum { 
	ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO,

	ALC233_FIXUP_LENOVO_GPIO2_MIC_HOTKEY,

	ALC245_FIXUP_BASS_HP_DAC,

	ALC245_FIXUP_ACER_MICMUTE_LED,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -6499,6 +6519,10 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ }

		},

	},

	[ALC233_FIXUP_STARLABS_STARFIGHTER] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc233_fixup_starlabs_starfighter,

	},

	[ALC294_FIXUP_BASS_SPEAKER_15] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc294_fixup_bass_speaker_15,
@@ -6576,6 +6600,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		/* Borrow the DAC routing selected for those Thinkpads */

		.v.func = alc285_fixup_thinkpad_x1_gen7,

	},

	[ALC245_FIXUP_ACER_MICMUTE_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_coef_micmute_led,

		.chained = true,

		.chain_id = ALC2XX_FIXUP_HEADSET_MIC,

	}

};



static const struct hda_quirk alc269_fixup_tbl[] = {
@@ -6591,6 +6621,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),

	SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x0840, "Acer Aspire E1", ALC269VB_FIXUP_ASPIRE_E1_COEF),

	SND_PCI_QUIRK(0x1025, 0x0943, "Acer Aspire V3-572G", ALC269_FIXUP_ASPIRE_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x100c, "Acer Aspire E5-574G", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1025, 0x101c, "Acer Veriton N2510G", ALC269_FIXUP_LIFEBOOK),

	SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
@@ -6627,6 +6658,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x159c, "Acer Nitro 5 AN515-58", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x1597, "Acer Nitro 5 AN517-55", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x169a, "Acer Swift SFG16", ALC256_FIXUP_ACER_SFG16_MICMUTE_LED),

	SND_PCI_QUIRK(0x1025, 0x171e, "Acer Nitro ANV15-51", ALC245_FIXUP_ACER_MICMUTE_LED),

	SND_PCI_QUIRK(0x1025, 0x1826, "Acer Helios ZPC", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1025, 0x182c, "Acer Helios ZPD", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1025, 0x1844, "Acer Helios ZPS", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),
@@ -7311,7 +7343,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc188, "Samsung Galaxy Book Flex (NT950QCT-A38A)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Book Flex (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP),

	SND_PCI_QUIRK(0x144d, 0xc1a4, "Samsung Galaxy Book Pro 360 (NT935QBD)", ALC298_FIXUP_SAMSUNG_AMP),
@@ -7651,6 +7684,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x2782, 0x1705, "MEDION E15433", ALC269VC_FIXUP_INFINIX_Y4_MAX),

	SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),

	SND_PCI_QUIRK(0x2782, 0x4900, "MEDION E15443", ALC233_FIXUP_MEDION_MTL_SPK),

	SND_PCI_QUIRK(0x7017, 0x2014, "Star Labs StarFighter", ALC233_FIXUP_STARLABS_STARFIGHTER),

	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),

	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),

	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),
@@ -7747,6 +7781,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC298_FIXUP_TPT470_DOCK_FIX, .name = "tpt470-dock-fix"},

	{.id = ALC298_FIXUP_TPT470_DOCK, .name = "tpt470-dock"},

	{.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},

	{.id = ALC233_FIXUP_STARLABS_STARFIGHTER, .name = "starlabs-starfighter"},

	{.id = ALC700_FIXUP_INTEL_REFERENCE, .name = "alc700-ref"},

	{.id = ALC269_FIXUP_SONY_VAIO, .name = "vaio"},

	{.id = ALC269_FIXUP_DELL_M101Z, .name = "dell-m101z"},

sound/hda/codecs/side-codecs/cs35l56_hda.c

+1 −6
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int cs35l56_hda_posture_put(struct snd_kcontrol *kcontrol, 
				   struct snd_ctl_elem_value *ucontrol)

{

	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);

	unsigned long pos = ucontrol->value.integer.value[0];

	long pos = ucontrol->value.integer.value[0];

	bool changed;

	int ret;
@@ -403,10 +403,6 @@ static void cs35l56_hda_remove_controls(struct cs35l56_hda *cs35l56) 
	snd_ctl_remove(cs35l56->codec->card, cs35l56->volume_ctl);

}



static const struct cs_dsp_client_ops cs35l56_hda_client_ops = {

	/* cs_dsp requires the client to provide this even if it is empty */

};



static int cs35l56_hda_request_firmware_file(struct cs35l56_hda *cs35l56,

					     const struct firmware **firmware, char **filename,

					     const char *base_name, const char *system_name,
@@ -1149,7 +1145,6 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id) 
	cs35l56->base.cal_index = cs35l56->index;



	cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);

	cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;



	if (cs35l56->base.reset_gpio) {

		dev_dbg(cs35l56->base.dev, "Hard reset\n");

sound/hda/controllers/intel.c

+2 −0
Original line number Diff line number Diff line
@@ -1751,6 +1751,8 @@ static int default_bdl_pos_adj(struct azx *chip) 
		return 1;

	case AZX_DRIVER_ZHAOXINHDMI:

		return 128;

	case AZX_DRIVER_NVIDIA:

		return 64;

	default:

		return 32;

	}

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -703,6 +703,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
				DMI_MATCH(DMI_PRODUCT_NAME, "Vivobook_ASUSLaptop M6501RR_M6501RR"),

			}

		},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK BM1503CDA"),

		}

	},

	{}

};

sound/soc/codecs/cs42l43-jack.c

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv) 
	switch (type & CS42L43_HSDET_TYPE_STS_MASK) {

	case 0x0: // CTIA

	case 0x1: // OMTP

	case 0x4:

		return cs42l43_run_load_detect(priv, true);

	case 0x2: // 3-pole

		return cs42l43_run_load_detect(priv, false);