diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-11-20 18:23:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-20 18:23:26 +0000 |
| commit | 730b5ec8ac3c2b0532edf0cc0291d29fa500a712 (patch) | |
| tree | 7cd3bd9f3f1c9e13448c9dc6fa0379d8da0149f5 | |
| parent | ASoC: rt5645: Separate regmap for rt5645 and rt5650 (diff) | |
| parent | ASoC: rt5645: Add dmi_system_id "Google Wizpig" (diff) | |
| download | wireguard-linux-730b5ec8ac3c2b0532edf0cc0291d29fa500a712.tar.xz wireguard-linux-730b5ec8ac3c2b0532edf0cc0291d29fa500a712.zip | |
Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 11cabf8e7551..2c4f06fae8c6 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -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"), + }, + }, { } }; |