Commit 15cb732c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here we see slightly more commits than wished, but basically all are
  small and mostly trivial fixes.

  The only core change is the workaround for __counted_by() usage in
  ASoC DAPM code, while the rest are device-specific fixes for Intel
  Baytrail devices, Cirrus and wcd937x codecs, and HD-audio / USB-audio
  devices"

* tag 'sound-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1
  ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3
  ALSA: usb-audio: Add quirks for Dell WD19 dock
  ASoC: codecs: wcd937x: relax the AUX PDM watchdog
  ASoC: codecs: wcd937x: add missing LO Switch control
  ASoC: dt-bindings: rockchip,rk3308-codec: add port property
  ALSA: hda/realtek: Add subwoofer quirk for Infinix ZERO BOOK 13
  ASoC: dapm: fix bounds checker error in dapm_widget_list_create
  ASoC: Intel: sst: Fix used of uninitialized ctx to log an error
  ASoC: cs42l51: Fix some error handling paths in cs42l51_probe()
  ASoC: Intel: sst: Support LPE0F28 ACPI HID
  ALSA: hda/realtek: Limit internal Mic boost on Dell platform
  ASoC: Intel: bytcr_rt5640: Add DMI quirk for Vexia Edu Atla 10 tablet
  ASoC: Intel: bytcr_rt5640: Add support for non ACPI instantiated codec
  ASoC: codecs: rt5640: Always disable IRQs from rt5640_cancel_work()
parents 0fc810ae e49370d7

Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ properties: 
      - const: mclk_rx

      - const: hclk



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



  resets:

    maxItems: 1

sound/hda/intel-dsp-config.c

+4 −0
Original line number Diff line number Diff line
@@ -721,6 +721,10 @@ static const struct config_entry acpi_config_table[] = { 
#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) || \

    IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)

/* BayTrail */

	{

		.flags = FLAG_SST_OR_SOF_BYT,

		.acpi_hid = "LPE0F28",

	},

	{

		.flags = FLAG_SST_OR_SOF_BYT,

		.acpi_hid = "80860F28",

sound/pci/hda/patch_realtek.c

+32 −3
Original line number Diff line number Diff line
@@ -7521,6 +7521,7 @@ enum { 
	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,

	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,

	ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,

	ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
@@ -7551,10 +7552,12 @@ enum { 
	ALC290_FIXUP_SUBWOOFER_HSJACK,

	ALC269_FIXUP_THINKPAD_ACPI,

	ALC269_FIXUP_DMIC_THINKPAD_ACPI,

	ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13,

	ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO,

	ALC255_FIXUP_ACER_MIC_NO_PRESENCE,

	ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,

	ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,

	ALC255_FIXUP_HEADSET_MODE,

	ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,
@@ -7996,6 +7999,16 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_pincfg_U7x7_headset_mic,

	},

	[ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x14, 0x90170151 }, /* use as internal speaker (LFE) */

			{ 0x1b, 0x90170152 }, /* use as internal speaker (back) */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST

	},

	[ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -8114,6 +8127,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

	[ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC269_FIXUP_DELL2_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -8394,6 +8413,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC255_FIXUP_HEADSET_MODE

	},

	[ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC255_FIXUP_DELL2_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -10725,6 +10750,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10982,6 +11008,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d05, 0x1409, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d17, 0x3288, "Haier Boyue G42", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),

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

	SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -10989,6 +11016,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),

	SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),

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

	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
@@ -11076,6 +11104,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},

	{.id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, .name = "dell-headset3"},

	{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, .name = "dell-headset4"},

	{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET, .name = "dell-headset4-quiet"},

	{.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},

	{.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},

	{.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
@@ -11630,16 +11659,16 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = { 
	SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,

		{0x19, 0x40000000},

		{0x1b, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,

		{0x19, 0x40000000},

		{0x1b, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x19, 0x40000000},

		{0x1a, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,

		{0x19, 0x40000000},

		{0x1a, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,

	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,

		{0x19, 0x40000000},

		{0x1a, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,

sound/soc/codecs/cs42l51.c

+5 −2
Original line number Diff line number Diff line
@@ -747,8 +747,10 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) 


	cs42l51->reset_gpio = devm_gpiod_get_optional(dev, "reset",

						      GPIOD_OUT_LOW);

	if (IS_ERR(cs42l51->reset_gpio))

		return PTR_ERR(cs42l51->reset_gpio);

	if (IS_ERR(cs42l51->reset_gpio)) {

		ret = PTR_ERR(cs42l51->reset_gpio);

		goto error;

	}



	if (cs42l51->reset_gpio) {

		dev_dbg(dev, "Release reset gpio\n");
@@ -780,6 +782,7 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) 
	return 0;



error:

	gpiod_set_value_cansleep(cs42l51->reset_gpio, 1);

	regulator_bulk_disable(ARRAY_SIZE(cs42l51->supplies),

			       cs42l51->supplies);

	return ret;

sound/soc/codecs/rt5640.c

+15 −12
Original line number Diff line number Diff line
@@ -2419,10 +2419,20 @@ static irqreturn_t rt5640_jd_gpio_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static void rt5640_cancel_work(void *data)

static void rt5640_disable_irq_and_cancel_work(void *data)

{

	struct rt5640_priv *rt5640 = data;



	if (rt5640->jd_gpio_irq_requested) {

		free_irq(rt5640->jd_gpio_irq, rt5640);

		rt5640->jd_gpio_irq_requested = false;

	}



	if (rt5640->irq_requested) {

		free_irq(rt5640->irq, rt5640);

		rt5640->irq_requested = false;

	}



	cancel_delayed_work_sync(&rt5640->jack_work);

	cancel_delayed_work_sync(&rt5640->bp_work);

}
@@ -2463,13 +2473,7 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component) 
	if (!rt5640->jack)

		return;



	if (rt5640->jd_gpio_irq_requested)

		free_irq(rt5640->jd_gpio_irq, rt5640);



	if (rt5640->irq_requested)

		free_irq(rt5640->irq, rt5640);



	rt5640_cancel_work(rt5640);

	rt5640_disable_irq_and_cancel_work(rt5640);



	if (rt5640->jack->status & SND_JACK_MICROPHONE) {

		rt5640_disable_micbias1_ovcd_irq(component);
@@ -2477,8 +2481,6 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component) 
		snd_soc_jack_report(rt5640->jack, 0, SND_JACK_BTN_0);

	}



	rt5640->jd_gpio_irq_requested = false;

	rt5640->irq_requested = false;

	rt5640->jd_gpio = NULL;

	rt5640->jack = NULL;

}
@@ -2798,7 +2800,8 @@ static int rt5640_suspend(struct snd_soc_component *component) 
	if (rt5640->jack) {

		/* disable jack interrupts during system suspend */

		disable_irq(rt5640->irq);

		rt5640_cancel_work(rt5640);

		cancel_delayed_work_sync(&rt5640->jack_work);

		cancel_delayed_work_sync(&rt5640->bp_work);

	}



	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
@@ -3032,7 +3035,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c) 
	INIT_DELAYED_WORK(&rt5640->jack_work, rt5640_jack_work);



	/* Make sure work is stopped on probe-error / remove */

	ret = devm_add_action_or_reset(&i2c->dev, rt5640_cancel_work, rt5640);

	ret = devm_add_action_or_reset(&i2c->dev, rt5640_disable_irq_and_cancel_work, rt5640);

	if (ret)

		return ret;