Commit 343b529a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here is a collection of fixes for 5.9. All look small and are nothing
  scary.

  The majority of changes are about ASoC driver- specific fixes, while
  there are a couple of ASoC core fixes (DAI lookup and lockdep stuff)
  and usual HD-audio quirks"

* tag 'sound-5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ALSA: hda/realtek - The Mic on a RedmiBook doesn't work
  ASoC: tlv320adcx140: Wake up codec before accessing register
  ASoC: core: Do not cleanup uninitialized dais on soc_pcm_open failure
  ALSA: hda: fixup headset for ASUS GX502 laptop
  ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1
  ASoC: Intel: haswell: Fix power transition refactor
  ASoC: tlv320adcx140: Fix accessing uninitialized adcx140->dev
  ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions
  ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811
  ASoC: meson: axg-toddr: fix channel order on g12 platforms
  ASoC: soc-core: add snd_soc_find_dai_with_mutex()
  ASoC: qcom: common: Fix refcount imbalance on error
  ASoC: rt700: Fix return check for devm_regmap_init_sdw()
  ASoC: rt715: Fix return check for devm_regmap_init_sdw()
  ASoC: rt711: Fix return check for devm_regmap_init_sdw()
  ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
  ASoC: max98373: Fix return check for devm_regmap_init_sdw()
  ASoC: ti: fixup ams_delta_mute() function name
  ASoC: pcm3168a: ignore 0 Hz settings
  ASoC: Intel: tgl_max98373: fix a runtime pm issue in multi-thread case
  ...
parents 1fd79656 8949b666

include/sound/soc.h

+4 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,8 @@ struct snd_soc_pcm_runtime { 
	     ((i) < (rtd)->num_cpus + (rtd)->num_codecs) &&		\

		     ((dai) = (rtd)->dais[i]);				\

	     (i)++)

#define for_each_rtd_dais_rollback(rtd, i, dai)		\

	for (; (--(i) >= 0) && ((dai) = (rtd)->dais[i]);)



void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);
@@ -1361,6 +1363,8 @@ void snd_soc_unregister_dai(struct snd_soc_dai *dai); 


struct snd_soc_dai *snd_soc_find_dai(

	const struct snd_soc_dai_link_component *dlc);

struct snd_soc_dai *snd_soc_find_dai_with_mutex(

	const struct snd_soc_dai_link_component *dlc);



#include <sound/soc-dai.h>

sound/pci/hda/patch_realtek.c

+78 −0
Original line number Diff line number Diff line
@@ -5993,6 +5993,40 @@ static void alc_fixup_disable_mic_vref(struct hda_codec *codec, 
		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);

}





static void alc294_gx502_toggle_output(struct hda_codec *codec,

					struct hda_jack_callback *cb)

{

	/* The Windows driver sets the codec up in a very different way where

	 * it appears to leave 0x10 = 0x8a20 set. For Linux we need to toggle it

	 */

	if (snd_hda_jack_detect_state(codec, 0x21) == HDA_JACK_PRESENT)

		alc_write_coef_idx(codec, 0x10, 0x8a20);

	else

		alc_write_coef_idx(codec, 0x10, 0x0a20);

}



static void alc294_fixup_gx502_hp(struct hda_codec *codec,

					const struct hda_fixup *fix, int action)

{

	/* Pin 0x21: headphones/headset mic */

	if (!is_jack_detectable(codec, 0x21))

		return;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		snd_hda_jack_detect_enable_callback(codec, 0x21,

				alc294_gx502_toggle_output);

		break;

	case HDA_FIXUP_ACT_INIT:

		/* Make sure to start in a correct state, i.e. if

		 * headphones have been plugged in before powering up the system

		 */

		alc294_gx502_toggle_output(codec, NULL);

		break;

	}

}



static void  alc285_fixup_hp_gpio_amp_init(struct hda_codec *codec,

			      const struct hda_fixup *fix, int action)

{
@@ -6173,6 +6207,9 @@ enum { 
	ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	ALC294_FIXUP_ASUS_HPE,

	ALC294_FIXUP_ASUS_COEF_1B,

	ALC294_FIXUP_ASUS_GX502_HP,

	ALC294_FIXUP_ASUS_GX502_PINS,

	ALC294_FIXUP_ASUS_GX502_VERBS,

	ALC285_FIXUP_HP_GPIO_LED,

	ALC285_FIXUP_HP_MUTE_LED,

	ALC236_FIXUP_HP_MUTE_LED,
@@ -6191,6 +6228,7 @@ enum { 
	ALC269_FIXUP_LEMOTE_A1802,

	ALC269_FIXUP_LEMOTE_A190X,

	ALC256_FIXUP_INTEL_NUC8_RUGGED,

	ALC255_FIXUP_XIAOMI_HEADSET_MIC,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -7338,6 +7376,33 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC

	},

	[ALC294_FIXUP_ASUS_GX502_PINS] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x03a11050 }, /* front HP mic */

			{ 0x1a, 0x01a11830 }, /* rear external mic */

			{ 0x21, 0x03211020 }, /* front HP out */

			{ }

		},

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_GX502_VERBS

	},

	[ALC294_FIXUP_ASUS_GX502_VERBS] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			/* set 0x15 to HP-OUT ctrl */

			{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },

			/* unmute the 0x15 amp */

			{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },

			{ }

		},

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_GX502_HP

	},

	[ALC294_FIXUP_ASUS_GX502_HP] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc294_fixup_gx502_hp,

	},

	[ALC294_FIXUP_ASUS_COEF_1B] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {
@@ -7527,6 +7592,16 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

	[ALC255_FIXUP_XIAOMI_HEADSET_MIC] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },

			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },

			{ }

		},

		.chained = true,

		.chain_id = ALC289_FIXUP_ASUS_GA401

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7711,6 +7786,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),

	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),

	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),

	SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),

	SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
@@ -7823,6 +7899,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),

	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),

	SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */

	SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),

	SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),
@@ -8000,6 +8077,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"},

	{.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"},

	{.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"},

	{.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},

	{}

};

#define ALC225_STANDARD_PINS \

sound/soc/codecs/max98373-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -838,8 +838,8 @@ static int max98373_sdw_probe(struct sdw_slave *slave, 


	/* Regmap Initialization */

	regmap = devm_regmap_init_sdw(slave, &max98373_sdw_regmap);

	if (!regmap)

		return -EINVAL;

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	return max98373_init(slave, regmap);

}

sound/soc/codecs/pcm3168a.c

+7 −0
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ static int pcm3168a_set_dai_sysclk(struct snd_soc_dai *dai, 
	struct pcm3168a_priv *pcm3168a = snd_soc_component_get_drvdata(dai->component);

	int ret;



	/*

	 * Some sound card sets 0 Hz as reset,

	 * but it is impossible to set. Ignore it here

	 */

	if (freq == 0)

		return 0;



	if (freq > PCM3168A_MAX_SYSCLK)

		return -EINVAL;

sound/soc/codecs/rt1308-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave, 


	/* Regmap Initialization */

	regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap);

	if (!regmap)

		return -EINVAL;

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	rt1308_sdw_init(&slave->dev, regmap, slave);

CRA Git | Maintained and supported by SUSTech CRA and CCSE