Commit 329bdcbb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull 6.17-devel branch for applying further changes cleanly.

Signed-off-by: default avatarTaksahi Iwai <tiwai@suse.de>
parents fa7d1673 9f2c0ac1

Documentation/sound/alsa-configuration.rst

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ delayed_register 
    notice the need.

skip_validation

    Skip unit descriptor validation (default: no).

    The option is used to ignores the validation errors with the hexdump

    The option is used to ignore the validation errors with the hexdump

    of the unit descriptor instead of a driver probe error, so that we

    can check its details.

quirk_flags

include/sound/sdca.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct sdca_device_data { 


enum sdca_quirk {

	SDCA_QUIRKS_RT712_VB,

	SDCA_QUIRKS_SKIP_FUNC_TYPE_PATCHING,

};



#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SDCA)

include/sound/sdca_function.h

+12 −9
Original line number Diff line number Diff line
@@ -1063,27 +1063,30 @@ struct sdca_entity_ge { 
/**

 * struct sdca_entity_hide - information specific to HIDE Entities

 * @hid: HID device structure

 * @hidtx_ids: HIDTx Report ID

 * @num_hidtx_ids: number of HIDTx Report ID

 * @hidrx_ids: HIDRx Report ID

 * @num_hidrx_ids: number of HIDRx Report ID

 * @hide_reside_function_num: indicating which Audio Function Numbers within this Device

 * @max_delay: the maximum time in microseconds allowed for the Device to change the ownership from Device to Host

 * @af_number_list: which Audio Function Numbers within this Device are sending/receiving the messages in this HIDE

 * @hid_desc: HID descriptor for the HIDE Entity

 * @hidtx_ids: HIDTx Report ID

 * @hidrx_ids: HIDRx Report ID

 * @af_number_list: which Audio Function Numbers within this Device are

 * sending/receiving the messages in this HIDE

 * @hide_reside_function_num: indicating which Audio Function Numbers

 * within this Device

 * @max_delay: the maximum time in microseconds allowed for the Device

 * to change the ownership from Device to Host

 * @hid_report_desc: HID Report Descriptor for the HIDE Entity

 * @hid_desc: HID descriptor for the HIDE Entity

 */

struct sdca_entity_hide {

	struct hid_device *hid;

	unsigned int *hidtx_ids;

	int num_hidtx_ids;

	unsigned int *hidrx_ids;

	int num_hidtx_ids;

	int num_hidrx_ids;

	unsigned int af_number_list[SDCA_MAX_FUNCTION_COUNT];

	unsigned int hide_reside_function_num;

	unsigned int max_delay;

	unsigned int af_number_list[SDCA_MAX_FUNCTION_COUNT];

	struct hid_descriptor hid_desc;

	unsigned char *hid_report_desc;

	struct hid_descriptor hid_desc;

};



/**

sound/hda/codecs/realtek/alc269.c

+15 −4
Original line number Diff line number Diff line
@@ -3700,6 +3700,7 @@ enum { 
	ALC236_FIXUP_DELL_DUAL_CODECS,

	ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,

	ALC287_FIXUP_TAS2781_I2C,

	ALC295_FIXUP_DELL_TAS2781_I2C,

	ALC245_FIXUP_TAS2781_SPI_2,

	ALC287_FIXUP_TXNW2781_I2C,

	ALC287_FIXUP_YOGA7_14ARB7_I2C,
@@ -5165,6 +5166,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc294_fixup_gx502_hp,

	},

	[ALC295_FIXUP_DELL_TAS2781_I2C] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = tas2781_fixup_tias_i2c,

		.chained = true,

		.chain_id = ALC289_FIXUP_DUAL_SPK

	},

	[ALC294_FIXUP_ASUS_GU502_PINS] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -6287,8 +6294,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0c28, "Dell Inspiron 16 Plus 7630", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),

	SND_PCI_QUIRK(0x1028, 0x0c4d, "Dell", ALC287_FIXUP_CS35L41_I2C_4),

	SND_PCI_QUIRK(0x1028, 0x0c94, "Dell Polaris 3 metal", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1028, 0x0c96, "Dell Polaris 2in1", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1028, 0x0c94, "Dell Polaris 3 metal", ALC295_FIXUP_DELL_TAS2781_I2C),

	SND_PCI_QUIRK(0x1028, 0x0c96, "Dell Polaris 2in1", ALC295_FIXUP_DELL_TAS2781_I2C),

	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC289_FIXUP_DELL_CS35L41_SPI_2),
@@ -6467,6 +6474,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8992, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8994, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8995, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x89a0, "HP Laptop 15-dw4xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x89a4, "HP ProBook 440 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89a6, "HP ProBook 450 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89aa, "HP EliteBook 630 G9", ALC236_FIXUP_HP_GPIO_LED),
@@ -6477,6 +6485,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x89da, "HP Spectre x360 14t-ea100", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),

	SND_PCI_QUIRK(0x103c, 0x89e7, "HP Elite x2 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8a0f, "HP Pavilion 14-ec1xxx", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8a20, "HP Laptop 15s-fq5xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
@@ -7069,8 +7078,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x38bf, "Yoga S980-14.5 proX LX Dual", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x38c3, "Y980 DUAL", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x38c7, "Thinkbook 13x Gen 4", ALC287_FIXUP_CS35L41_I2C_4),

	SND_PCI_QUIRK(0x17aa, 0x38c8, "Thinkbook 13x Gen 4", ALC287_FIXUP_CS35L41_I2C_4),

	SND_PCI_QUIRK(0x17aa, 0x38c7, "Thinkbook 13x Gen 4", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38c8, "Thinkbook 13x Gen 4", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38cb, "Y790 YG DUAL", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x38d2, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
@@ -7091,6 +7100,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3929, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x392b, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

sound/hda/codecs/side-codecs/cs35l41_hda_property.c

+4 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ static const struct cs35l41_config cs35l41_config_table[] = { 
	{ "17AA38C8", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },

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

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

	{ "17AA3929", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },

	{ "17AA392B", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },

	{}

};
@@ -558,6 +560,8 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { 
	{ "CSC3551", "17AA38C8", generic_dsd_config },

	{ "CSC3551", "17AA38F9", generic_dsd_config },

	{ "CSC3551", "17AA38FA", generic_dsd_config },

	{ "CSC3551", "17AA3929", generic_dsd_config },

	{ "CSC3551", "17AA392B", generic_dsd_config },

	{}

};