Commit 58fdd848 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. It became slightly bigger than usual due
  to timing issues (holidays, etc), but all changes are rather
  device-specific fixes, so not really worrisome.

   - ASoC Cirrus codec fixes for AMD

   - Various fixes for ASoC Intel AVS, Qualcomm, SoundWire, FSL,
     Mediatek, Renesas

   - A few HD-audio quirks, and USB-audio regression fixes for Presonus"

* tag 'sound-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: hda/realtek: Enable mic on Vaio RPL
  ASoC: dt-bindings: pm4125-sdw: correct number of soundwire ports
  ASoC: renesas: rz-ssi: Use proper dma_buffer_pos after resume
  ASoC: soc_sdw_utils: remove cs42l43 component_name
  ASoC: fsl_sai: Fix sync error in consumer mode
  ASoC: Fix build for sdw_utils
  ALSA: hda/realtek: Fix mute led for HP Victus 15-fa1xxx (MB 8C2D)
  ASoC: rt721: fix prepare clock stop failed
  ALSA: usb-audio: don't log messages meant for 1810c when initializing 1824c
  ASoC: mediatek: Fix double pm_runtime_disable in remove functions
  ASoC: fsl_micfil: correct the endian format for DSD
  ASoC: fsl_sai: fix bit order for DSD format
  ASoC: Intel: avs: Use snd_codec format when initializing probe
  ASoC: Intel: avs: Disable periods-elapsed work when closing PCM
  ASoC: Intel: avs: Unprepare a stream when XRUN occurs
  ASoC: sdw_utils: add name_prefix for rt1321 part id
  ASoC: qdsp6: q6asm: do not sleep while atomic
  ASoC: Intel: soc-acpi-intel-ptl-match: Remove cs42l43 match from sdw link3
  ASOC: max98090/91: fix for filter configuration: AHPF removed DMIC2_HPF added
  ASoC: amd: acp: Add ACP7.0 match entries for cs35l56 and cs42l43
  ...
parents 3ad81aa5 390db60f

Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 4

    items:

      enum: [1, 2, 3, 4]
@@ -48,7 +48,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 5

    items:

      enum: [1, 2, 3, 4, 5]

sound/hda/codecs/realtek/alc269.c

+14 −0
Original line number Diff line number Diff line
@@ -3736,6 +3736,7 @@ enum { 
	ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1,

	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,

	ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK,

	ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -6172,6 +6173,16 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ 0x1e, 0x90170150 }, /* Internal Speaker */

			{ }

		},

	},

	[ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */

			{ 0x1a, 0x22a190a0 }, /* dock mic */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST

	}

};
@@ -6578,6 +6589,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8c16, "HP Spectre x360 2-in-1 Laptop 16-aa0xxx", ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX),

	SND_PCI_QUIRK(0x103c, 0x8c17, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8c21, "HP Pavilion Plus Laptop 14-ey0XXX", ALC245_FIXUP_HP_X360_MUTE_LEDS),

	SND_PCI_QUIRK(0x103c, 0x8c2d, "HP Victus 15-fa1xxx (MB 8C2D)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8c30, "HP Victus 15-fb1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c47, "HP EliteBook 840 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -6959,6 +6971,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x971d, "Clevo N970T[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa500, "Clevo NL5[03]RU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa554, "VAIO VJFH52", ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa559, "VAIO RPL", ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa600, "Clevo NL50NU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa650, "Clevo NP[567]0SN[CD]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0xa671, "Clevo NP70SN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -7080,6 +7093,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38b4, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),

	HDA_CODEC_QUIRK(0x17aa, 0x391c, "Lenovo Yoga 7 2-in-1 14AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x38b5, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x38b6, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x38b7, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),

sound/soc/amd/acp/amd-acp70-acpi-match.c

+157 −0
Original line number Diff line number Diff line
@@ -30,6 +30,20 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = { 
	.group_id = 1

};



static const struct snd_soc_acpi_endpoint spk_2_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 2,

	.group_id = 1

};



static const struct snd_soc_acpi_endpoint spk_3_endpoint = {

	.num = 0,

	.aggregated = 1,

	.group_position = 3,

	.group_id = 1

};



static const struct snd_soc_acpi_adr_device rt711_rt1316_group_adr[] = {

	{

		.adr = 0x000030025D071101ull,
@@ -112,6 +126,134 @@ static const struct snd_soc_acpi_adr_device rt1320_1_single_adr[] = { 
	}

};



static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {

	{ /* Jack Playback Endpoint */

		.num = 0,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* DMIC Capture Endpoint */

		.num = 1,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* Jack Capture Endpoint */

		.num = 2,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{ /* Speaker Playback Endpoint */

		.num = 3,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

};



static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {

	{

		.adr = 0x00003001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = {

	{

		.adr = 0x00013001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),

		.endpoints = cs42l43_endpoints,

		.name_prefix = "cs42l43"

	},

	{

		.adr = 0x00013001FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00013101FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00013201FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00013301FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP4"

	},

};



static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = {

	{

		.adr = 0x00013301FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00013201FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP2"

	},

	{

		.adr = 0x00013101FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_2_endpoint,

		.name_prefix = "AMP3"

	},

	{

		.adr = 0x00013001FA355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_3_endpoint,

		.name_prefix = "AMP4"

	},

};



static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr),

		.adr_d = cs42l43_1_cs35l56x4_1_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(cs42l43_0_adr),

		.adr_d = cs42l43_0_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs35l56x4_1_adr),

		.adr_d = cs35l56x4_1_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs35l56x4_1_adr),

		.adr_d = cs35l56x4_1_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr acp70_rt722_only[] = {

	{

		.mask = BIT(0),
@@ -151,6 +293,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = { 
		.links = acp70_4_in_1_sdca,

		.drv_name = "amd_sdw",

	},

	{

		.link_mask = BIT(0) | BIT(1),

		.links = acp70_cs42l43_l0_cs35l56x4_l1,

		.drv_name = "amd_sdw",

	},

	{

		.link_mask = BIT(1),

		.links = acp70_cs42l43_l1_cs35l56x4_l1,

		.drv_name = "amd_sdw",

	},

	{

		.link_mask = BIT(1),

		.links = acp70_cs35l56x4_l1,

		.drv_name = "amd_sdw",

	},

	{},

};

EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sdw_machines);

sound/soc/codecs/cs-amp-lib-test.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <kunit/resource.h>

#include <kunit/test.h>

#include <kunit/test-bug.h>

#include <kunit/static_stub.h>

#include <linux/device/faux.h>

#include <linux/firmware/cirrus/cs_dsp.h>

sound/soc/codecs/cs530x.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ static int cs530x_set_sysclk(struct snd_soc_component *component, int clk_id, 
	case CS530X_SYSCLK_SRC_PLL:

		break;

	default:

		dev_err(component->dev, "Invalid clock id %d\n", clk_id);

		dev_err(component->dev, "Invalid sysclk source: %d\n", source);

		return -EINVAL;

	}