Commit 1a7ba009 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v7.0-rc1' of... 

Merge tag 'asoc-fix-v7.0-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v7.0

One quirk and a fix for handling of exotic peripherals on cs42l43.
parents 003ce8c9 32fc4168

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -703,6 +703,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
				DMI_MATCH(DMI_PRODUCT_NAME, "Vivobook_ASUSLaptop M6501RR_M6501RR"),

			}

		},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK BM1503CDA"),

		}

	},

	{}

};

sound/soc/codecs/cs42l43-jack.c

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv) 
	switch (type & CS42L43_HSDET_TYPE_STS_MASK) {

	case 0x0: // CTIA

	case 0x1: // OMTP

	case 0x4:

		return cs42l43_run_load_detect(priv, true);

	case 0x2: // 3-pole

		return cs42l43_run_load_detect(priv, false);