Commit 6f6ebb98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes for 5.19 merge window. Nothing particular
  stands out, as most changes are device-specific fixes and quirks"

* tag 'sound-fix-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  selftests: alsa: Handle pkg-config failure more gracefully
  ALSA: usb-audio: Optimize TEAC clock quirk
  ASoC: da7219: cancel AAD related work earlier for jack removal
  ASoC: da7219: Fix pole orientation detection on certain headsets
  ASoC: Intel: avs: Fix build error on arc, m68k and sparc
  ALSA: hda/realtek - Fix microphone noise on ASUS TUF B550M-PLUS
  ALSA: hda/via: Delete does not require return
  ALSA: hda/realtek: Enable 4-speaker output for Dell XPS 15 9520 laptop
  ASoC: Intel: common: fix typo for tplg naming
  ALSA: usb-audio: Cancel pending work at closing a MIDI substream
  ALSA: usb-audio: Add mixer mapping for Gigabyte B450/550 Mobos
  ASoC: rt5640: Do not manipulate pin "Platform Clock" if the "Platform Clock" is not in the DAPM
  ASoC: SOF: amd: Fixed Build error
  ASoC: fsl_sai: Fix FSL_SAI_xDR/xFR definition
  ASoC: soc-pcm: fix BE transition for TRIGGER_START
parents ab18b7b3 672362cb

sound/pci/hda/patch_realtek.c

+11 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,7 @@ enum { 
	ALC1220_FIXUP_CLEVO_PB51ED_PINS,

	ALC887_FIXUP_ASUS_AUDIO,

	ALC887_FIXUP_ASUS_HMIC,

	ALCS1200A_FIXUP_MIC_VREF,

};



static void alc889_fixup_coef(struct hda_codec *codec,
@@ -2526,6 +2527,14 @@ static const struct hda_fixup alc882_fixups[] = { 
		.chained = true,

		.chain_id = ALC887_FIXUP_ASUS_AUDIO,

	},

	[ALCS1200A_FIXUP_MIC_VREF] = {

		.type = HDA_FIXUP_PINCTLS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x18, PIN_VREF50 }, /* rear mic */

			{ 0x19, PIN_VREF50 }, /* front mic */

			{}

		}

	},

};



static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2563,6 +2572,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),

	SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS),

	SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x1043, 0x8797, "ASUS TUF B550M-PLUS", ALCS1200A_FIXUP_MIC_VREF),

	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
@@ -8905,6 +8915,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0a62, "Dell Precision 5560", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0a9d, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

sound/pci/hda/patch_via.c

+0 −2
Original line number Diff line number Diff line
@@ -449,8 +449,6 @@ static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid) 
		def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30));

		snd_hda_codec_set_pincfg(codec, nid, def_conf);

	}



	return;

}



static int vt1708_jack_detect_get(struct snd_kcontrol *kcontrol,

sound/soc/amd/acp/acp-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/pci.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/module.h>



#include "amd.h"

#include "../mach-config.h"

sound/soc/codecs/da7219-aad.c

+15 −3
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ static void da7219_aad_btn_det_work(struct work_struct *work) 
	bool micbias_up = false;

	int retries = 0;



	/* Disable ground switch */

	snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00);



	/* Drive headphones/lineout */

	snd_soc_component_update_bits(component, DA7219_HP_L_CTRL,

			    DA7219_HP_L_AMP_OE_MASK,
@@ -153,6 +156,9 @@ static void da7219_aad_hptest_work(struct work_struct *work) 
		tonegen_freq_hptest = cpu_to_le16(DA7219_AAD_HPTEST_RAMP_FREQ_INT_OSC);

	}



	/* Disable ground switch */

	snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00);



	/* Ensure gain ramping at fastest rate */

	gain_ramp_ctrl = snd_soc_component_read(component, DA7219_GAIN_RAMP_CTRL);

	snd_soc_component_write(component, DA7219_GAIN_RAMP_CTRL, DA7219_GAIN_RAMP_RATE_X8);
@@ -428,6 +434,10 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data) 
			mask |= DA7219_AAD_REPORT_ALL_MASK;

			da7219_aad->jack_inserted = false;



			/* Cancel any pending work */

			cancel_work_sync(&da7219_aad->btn_det_work);

			cancel_work_sync(&da7219_aad->hptest_work);



			/* Un-drive headphones/lineout */

			snd_soc_component_update_bits(component, DA7219_HP_R_CTRL,

					    DA7219_HP_R_AMP_OE_MASK, 0);
@@ -444,9 +454,8 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data) 
			snd_soc_dapm_disable_pin(dapm, "Mic Bias");

			snd_soc_dapm_sync(dapm);



			/* Cancel any pending work */

			cancel_work_sync(&da7219_aad->btn_det_work);

			cancel_work_sync(&da7219_aad->hptest_work);

			/* Enable ground switch */

			snd_soc_component_update_bits(component, 0xFB, 0x01, 0x01);

		}

	}
@@ -899,6 +908,9 @@ int da7219_aad_init(struct snd_soc_component *component) 
	snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1,

			    DA7219_BUTTON_CONFIG_MASK, 0);



	/* Enable ground switch */

	snd_soc_component_update_bits(component, 0xFB, 0x01, 0x01);



	INIT_WORK(&da7219_aad->btn_det_work, da7219_aad_btn_det_work);

	INIT_WORK(&da7219_aad->hptest_work, da7219_aad_hptest_work);

sound/soc/codecs/rt5640.c

+9 −2
Original line number Diff line number Diff line
@@ -2094,11 +2094,13 @@ EXPORT_SYMBOL_GPL(rt5640_sel_asrc_clk_src); 
void rt5640_enable_micbias1_for_ovcd(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);



	snd_soc_dapm_mutex_lock(dapm);

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "LDO2");

	snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS1");

	/* OVCD is unreliable when used with RCCLK as sysclk-source */

	if (rt5640->use_platform_clock)

		snd_soc_dapm_force_enable_pin_unlocked(dapm, "Platform Clock");

	snd_soc_dapm_sync_unlocked(dapm);

	snd_soc_dapm_mutex_unlock(dapm);
@@ -2108,8 +2110,10 @@ EXPORT_SYMBOL_GPL(rt5640_enable_micbias1_for_ovcd); 
void rt5640_disable_micbias1_for_ovcd(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);



	snd_soc_dapm_mutex_lock(dapm);

	if (rt5640->use_platform_clock)

		snd_soc_dapm_disable_pin_unlocked(dapm, "Platform Clock");

	snd_soc_dapm_disable_pin_unlocked(dapm, "MICBIAS1");

	snd_soc_dapm_disable_pin_unlocked(dapm, "LDO2");
@@ -2535,6 +2539,9 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component, 
		rt5640->jd_gpio_irq_requested = true;

	}



	if (jack_data && jack_data->use_platform_clock)

		rt5640->use_platform_clock = jack_data->use_platform_clock;



	ret = request_irq(rt5640->irq, rt5640_irq,

			  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

			  "rt5640", rt5640);