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

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

Pull sound fixes from Takashi Iwai:
 "This batch became unexpectedly bigger due to the pending ASoC patches,
  but all look small and fine device-specific fixes.

  Many of the commits are for ASoC Intel drivers, while the rest are for
  ASoC small codec/platform fixes and HD-audio quirks"

* tag 'sound-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1
  ALSA: aloop: Fix initialization of controls
  ALSA: hda/conexant: Apply quirk for another HP ZBook G5 model
  ASoC: fsl_esai: Fix TDM slot setup for I2S mode
  ASoC: codecs: lpass-rx-macro: set npl clock rate correctly
  ASoC: codecs: lpass-tx-macro: set npl clock rate correctly
  ASoC: sunxi: sun4i-codec: fill ASoC card owner
  ASoC: cygnus: fix for_each_child.cocci warnings
  ASoC: max98373: Added 30ms turn on/off time delay
  ASoC: max98373: Changed amp shutdown register as volatile
  ASoC: intel: atom: Remove 44100 sample-rate from the media and deep-buffer DAI descriptions
  ASoC: intel: atom: Stop advertising non working S24LE support
  ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips
  ASoC: SOF: Intel: move ELH chip info
  ASoC: SOF: Intel: APL: set shutdown callback to hda_dsp_shutdown
  ASoC: SOF: Intel: CNL: set shutdown callback to hda_dsp_shutdown
  ASoC: SOF: Intel: ICL: set shutdown callback to hda_dsp_shutdown
  ASoC: SOF: Intel: TGL: set shutdown callback to hda_dsp_shutdown
  ASoC: SOF: Intel: TGL: fix EHL ops
  ASoC: SOF: core: harden shutdown helper
  ...
parents d381b05e c8426b27

sound/drivers/aloop.c

+8 −3
Original line number Diff line number Diff line
@@ -1571,6 +1571,14 @@ static int loopback_mixer_new(struct loopback *loopback, int notify) 
					return -ENOMEM;

				kctl->id.device = dev;

				kctl->id.subdevice = substr;



				/* Add the control before copying the id so that

				 * the numid field of the id is set in the copy.

				 */

				err = snd_ctl_add(card, kctl);

				if (err < 0)

					return err;



				switch (idx) {

				case ACTIVE_IDX:

					setup->active_id = kctl->id;
@@ -1587,9 +1595,6 @@ static int loopback_mixer_new(struct loopback *loopback, int notify) 
				default:

					break;

				}

				err = snd_ctl_add(card, kctl);

				if (err < 0)

					return err;

			}

		}

	}

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -944,6 +944,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),

sound/pci/hda/patch_realtek.c

+16 −0
Original line number Diff line number Diff line
@@ -3927,6 +3927,15 @@ static void alc271_fixup_dmic(struct hda_codec *codec, 
		snd_hda_sequence_write(codec, verbs);

}



/* Fix the speaker amp after resume, etc */

static void alc269vb_fixup_aspire_e1_coef(struct hda_codec *codec,

					  const struct hda_fixup *fix,

					  int action)

{

	if (action == HDA_FIXUP_ACT_INIT)

		alc_update_coef_idx(codec, 0x0d, 0x6000, 0x6000);

}



static void alc269_fixup_pcm_44k(struct hda_codec *codec,

				 const struct hda_fixup *fix, int action)

{
@@ -6301,6 +6310,7 @@ enum { 
	ALC283_FIXUP_HEADSET_MIC,

	ALC255_FIXUP_MIC_MUTE_LED,

	ALC282_FIXUP_ASPIRE_V5_PINS,

	ALC269VB_FIXUP_ASPIRE_E1_COEF,

	ALC280_FIXUP_HP_GPIO4,

	ALC286_FIXUP_HP_GPIO_LED,

	ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY,
@@ -6979,6 +6989,10 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ },

		},

	},

	[ALC269VB_FIXUP_ASPIRE_E1_COEF] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269vb_fixup_aspire_e1_coef,

	},

	[ALC280_FIXUP_HP_GPIO4] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc280_fixup_hp_gpio4,
@@ -7901,6 +7915,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),

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

	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),

	SND_PCI_QUIRK(0x1025, 0x1065, "Acer Aspire C20-820", ALC269VC_FIXUP_ACER_HEADSET_MIC),
@@ -8395,6 +8410,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC283_FIXUP_HEADSET_MIC, .name = "alc283-headset"},

	{.id = ALC255_FIXUP_MIC_MUTE_LED, .name = "alc255-dell-mute"},

	{.id = ALC282_FIXUP_ASPIRE_V5_PINS, .name = "aspire-v5"},

	{.id = ALC269VB_FIXUP_ASPIRE_E1_COEF, .name = "aspire-e1-coef"},

	{.id = ALC280_FIXUP_HP_GPIO4, .name = "hp-gpio4"},

	{.id = ALC286_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},

	{.id = ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY, .name = "hp-gpio2-hotkey"},

sound/soc/bcm/cygnus-ssp.c

+3 −1
Original line number Diff line number Diff line
@@ -1348,8 +1348,10 @@ static int cygnus_ssp_probe(struct platform_device *pdev) 
					&cygnus_ssp_dai[active_port_count]);



		/* negative is err, 0 is active and good, 1 is disabled */

		if (err < 0)

		if (err < 0) {

			of_node_put(child_node);

			return err;

		}

		else if (!err) {

			dev_dbg(dev, "Activating DAI: %s\n",

				cygnus_ssp_dai[active_port_count].name);

sound/soc/codecs/lpass-rx-macro.c

+1 −1
Original line number Diff line number Diff line
@@ -3551,7 +3551,7 @@ static int rx_macro_probe(struct platform_device *pdev) 


	/* set MCLK and NPL rates */

	clk_set_rate(rx->clks[2].clk, MCLK_FREQ);

	clk_set_rate(rx->clks[3].clk, MCLK_FREQ);

	clk_set_rate(rx->clks[3].clk, 2 * MCLK_FREQ);



	ret = clk_bulk_prepare_enable(RX_NUM_CLKS_MAX, rx->clks);

	if (ret)