Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730b5ec8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/rt5645' of... 

Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645
parents 49abc6cd 3f58b703

sound/soc/codecs/rt5645.c

+15 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on) 
				regmap_write(rt5645->regmap, RT5645_PR_BASE +

					RT5645_MAMP_INT_REG2, 0xfc00);

				snd_soc_write(codec, RT5645_DEPOP_M2, 0x1140);

				msleep(40);

				msleep(70);

				rt5645->hp_on = true;

			} else {

				/* depop parameters */
@@ -3558,6 +3558,20 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Reks"),

		},

	},

	{

		.ident = "Google Edgar",

		.callback = strago_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"),

		},

	},

	{

		.ident = "Google Wizpig",

		.callback = strago_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "Wizpig"),

		},

	},

	{ }

};