Commit 0f1dd5e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of device-specific fixes. It became a bit bigger than
  wished, but all look reasonably small and safe to apply.

   - A few Cirrus Logic CS35L56 and CS42L43 driver fixes

   - ASoC SOF fixes and workarounds

   - Various ASoC Intel fixes

   - Lots of HD-, USB-audio and AMD ACP quirks"

* tag 'sound-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (33 commits)
  ALSA: usb-audio: More relaxed check of MIDI jack names
  ALSA: hda/realtek: fix mute/micmute LED For HP mt645
  ALSA: hda/realtek: cs35l41: Fix order and duplicates in quirks table
  ALSA: hda/realtek: cs35l41: Fix device ID / model name
  ALSA: hda/realtek: cs35l41: Add internal speaker support for ASUS UM3402 with missing DSD
  ASoC: cs35l56: Workaround for ACPI with broken spk-id-gpios property
  ALSA: hda: Add Lenovo Legion 7i gen7 sound quirk
  ASoC: SOF: IPC3: fix message bounds on ipc ops
  ASoC: SOF: ipc4-pcm: Workaround for crashed firmware on system suspend
  ASoC: q6dsp: fix event handler prototype
  ASoC: SOF: Intel: pci-lnl: Change the topology path to intel/sof-ipc4-tplg
  ASoC: SOF: Intel: pci-tgl: Change the default paths and firmware names
  ASoC: amd: yc: Fix non-functional mic on Lenovo 82UU
  ASoC: rt5645: Add DMI quirk for inverted jack-detect on MeeGoPad T8
  ASoC: rt5645: Make LattePanda board DMI match more precise
  ASoC: SOF: amd: Fix locking in ACP IRQ handler
  ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work()
  ASoC: Intel: cht_bsw_rt5645: Cleanup codec_name handling
  ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT boards
  ASoC: cs35l56: Remove default from IRQ1_CFG register
  ...
parents beda9c23 41c25e19

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Google SC7280-Herobrine ASoC sound card driver



maintainers:

  - Srinivasa Rao Mandadapu <srivasam@codeaurora.org>

  - Judy Hsiao <judyhsiao@chromium.org>



description:

include/sound/tas2781.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ struct tasdevice_priv { 


void tas2781_reset(struct tasdevice_priv *tas_dev);

int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,

	struct module *module,

	void (*cont)(const struct firmware *fw, void *context));

struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c);

int tasdevice_init(struct tasdevice_priv *tas_priv);

sound/pci/hda/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config SND_HDA_SCODEC_CS35L56_I2C 
	depends on I2C

	depends on ACPI || COMPILE_TEST

	depends on SND_SOC

	select CS_DSP

	select FW_CS_DSP

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56
@@ -171,7 +171,7 @@ config SND_HDA_SCODEC_CS35L56_SPI 
	depends on SPI_MASTER

	depends on ACPI || COMPILE_TEST

	depends on SND_SOC

	select CS_DSP

	select FW_CS_DSP

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56

sound/pci/hda/cs35l41_hda_property.c

+4 −0
Original line number Diff line number Diff line
@@ -91,10 +91,12 @@ static const struct cs35l41_config cs35l41_config_table[] = { 
	{ "10431D1F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },

	{ "10431DA2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },

	{ "10431E02", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },

	{ "10431E12", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },

	{ "10431EE2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },

	{ "10431F12", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },

	{ "10431F1F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 },

	{ "10431F62", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },

	{ "17AA386F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },

	{ "17AA38B4", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },

	{ "17AA38B5", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },

	{ "17AA38B6", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },
@@ -427,10 +429,12 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { 
	{ "CSC3551", "10431D1F", generic_dsd_config },

	{ "CSC3551", "10431DA2", generic_dsd_config },

	{ "CSC3551", "10431E02", generic_dsd_config },

	{ "CSC3551", "10431E12", generic_dsd_config },

	{ "CSC3551", "10431EE2", generic_dsd_config },

	{ "CSC3551", "10431F12", generic_dsd_config },

	{ "CSC3551", "10431F1F", generic_dsd_config },

	{ "CSC3551", "10431F62", generic_dsd_config },

	{ "CSC3551", "17AA386F", generic_dsd_config },

	{ "CSC3551", "17AA38B4", generic_dsd_config },

	{ "CSC3551", "17AA38B5", generic_dsd_config },

	{ "CSC3551", "17AA38B6", generic_dsd_config },

sound/pci/hda/patch_conexant.c

+18 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ enum { 
	CXT_FIXUP_HP_ZBOOK_MUTE_LED,

	CXT_FIXUP_HEADSET_MIC,

	CXT_FIXUP_HP_MIC_NO_PRESENCE,

	CXT_PINCFG_SWS_JS201D,

};



/* for hda_fixup_thinkpad_acpi() */
@@ -841,6 +842,17 @@ static const struct hda_pintbl cxt_pincfg_lemote[] = { 
	{}

};



/* SuoWoSi/South-holding JS201D with sn6140 */

static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {

	{ 0x16, 0x03211040 }, /* hp out */

	{ 0x17, 0x91170110 }, /* SPK/Class_D */

	{ 0x18, 0x95a70130 }, /* Internal mic */

	{ 0x19, 0x03a11020 }, /* Headset Mic */

	{ 0x1a, 0x40f001f0 }, /* Not used */

	{ 0x21, 0x40f001f0 }, /* Not used */

	{}

};



static const struct hda_fixup cxt_fixups[] = {

	[CXT_PINCFG_LENOVO_X200] = {

		.type = HDA_FIXUP_PINS,
@@ -996,6 +1008,10 @@ static const struct hda_fixup cxt_fixups[] = { 
		.chained = true,

		.chain_id = CXT_FIXUP_HEADSET_MIC,

	},

	[CXT_PINCFG_SWS_JS201D] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = cxt_pincfg_sws_js201d,

	},

};



static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1069,6 +1085,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),

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

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x14f1, 0x0265, "SWS JS201D", CXT_PINCFG_SWS_JS201D),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),
@@ -1109,6 +1126,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { 
	{ .id = CXT_FIXUP_HP_ZBOOK_MUTE_LED, .name = "hp-zbook-mute-led" },

	{ .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },

	{ .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },

	{ .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },

	{}

};