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

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

Pull sound fixes from Takashi Iwai:
 "A collection of device-specific small fixes such as ASoC Realtek codec
  fixes for PM issues, ASoC nau8821 quirk additions, and usual HD- and
  USB-audio quirks"

* tag 'sound-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Support ASUS G713PV laptop
  ALSA: usb-audio: Update for native DSD support quirks
  ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset
  ALSA: hda/relatek: Enable Mute LED on HP 250 G8
  ASoC: atmel: Fix the 8K sample parameter in I2SC master
  ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0
  ASoC: rt711: fix for JD event handling in ClockStop Mode0
  ASoC: rt722-sdca: fix for JD event handling in ClockStop Mode0
  ASoC: rt712-sdca: fix for JD event handling in ClockStop Mode0
  ASoc: codecs: ES8316: Fix DMIC config
  ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0
  ASoC: wm8904: Fill the cache for WM8904_ADC_TEST_0 register
  ASoC: nau8821: Add DMI quirk mechanism for active-high jack-detect
  ASoC: da7219: Check for failure reading AAD IRQ events
  ASoC: da7219: Flush pending AAD IRQ when suspending
  ALSA: seq: remove redundant unsigned comparison to zero
  ASoC: fsl_spdif: Silence output on stop
parents 17bf3df9 3b9adfbb

sound/core/seq/seq_ump_client.c

+1 −2
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ static void update_group_attrs(struct seq_ump_client *client) 
	}



	list_for_each_entry(fb, &client->ump->block_list, list) {

		if (fb->info.first_group < 0 ||

		    fb->info.first_group + fb->info.num_groups > SNDRV_UMP_MAX_GROUPS)

		if (fb->info.first_group + fb->info.num_groups > SNDRV_UMP_MAX_GROUPS)

			break;

		group = &client->groups[fb->info.first_group];

		for (i = 0; i < fb->info.num_groups; i++, group++) {

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -9541,6 +9541,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

	SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

	SND_PCI_QUIRK(0x103c, 0x881d, "HP 250 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -9671,6 +9672,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1c9f, "ASUS G614JI", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1d1f, "ASUS ROG Strix G17 2023 (G713PV)", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401),

	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),

	SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402", ALC245_FIXUP_CS35L41_SPI_2),

sound/soc/atmel/atmel-i2s.c

+4 −1
Original line number Diff line number Diff line
@@ -163,11 +163,14 @@ struct atmel_i2s_gck_param { 


#define I2S_MCK_12M288		12288000UL

#define I2S_MCK_11M2896		11289600UL

#define I2S_MCK_6M144		6144000UL



/* mck = (32 * (imckfs+1) / (imckdiv+1)) * fs */

static const struct atmel_i2s_gck_param gck_params[] = {

	/* mck = 6.144Mhz */

	{  8000, I2S_MCK_6M144,  1, 47},	/* mck =  768 fs */



	/* mck = 12.288MHz */

	{  8000, I2S_MCK_12M288, 0, 47},	/* mck = 1536 fs */

	{ 16000, I2S_MCK_12M288, 1, 47},	/* mck =  768 fs */

	{ 24000, I2S_MCK_12M288, 3, 63},	/* mck =  512 fs */

	{ 32000, I2S_MCK_12M288, 3, 47},	/* mck =  384 fs */

sound/soc/codecs/da7219-aad.c

+9 −3
Original line number Diff line number Diff line
@@ -361,11 +361,15 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data) 
	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);

	u8 events[DA7219_AAD_IRQ_REG_MAX];

	u8 statusa;

	int i, report = 0, mask = 0;

	int i, ret, report = 0, mask = 0;



	/* Read current IRQ events */

	regmap_bulk_read(da7219->regmap, DA7219_ACCDET_IRQ_EVENT_A,

	ret = regmap_bulk_read(da7219->regmap, DA7219_ACCDET_IRQ_EVENT_A,

			       events, DA7219_AAD_IRQ_REG_MAX);

	if (ret) {

		dev_warn_ratelimited(component->dev, "Failed to read IRQ events: %d\n", ret);

		return IRQ_NONE;

	}



	if (!events[DA7219_AAD_IRQ_REG_A] && !events[DA7219_AAD_IRQ_REG_B])

		return IRQ_NONE;
@@ -944,6 +948,8 @@ void da7219_aad_suspend(struct snd_soc_component *component) 
			}

		}

	}



	synchronize_irq(da7219_aad->irq);

}



void da7219_aad_resume(struct snd_soc_component *component)

sound/soc/codecs/es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static const char * const es8316_dmic_txt[] = { 
		"dmic data at high level",

		"dmic data at low level",

};

static const unsigned int es8316_dmic_values[] = { 0, 1, 2 };

static const unsigned int es8316_dmic_values[] = { 0, 2, 3 };

static const struct soc_enum es8316_dmic_src_enum =

	SOC_VALUE_ENUM_SINGLE(ES8316_ADC_DMIC, 0, 3,

			      ARRAY_SIZE(es8316_dmic_txt),