diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-16 14:14:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-16 14:14:26 +0100 |
| commit | e5dbdcb31285a975d623d2bf2c9e7b2940489008 (patch) | |
| tree | fbff5006000ee7e9d98320363256223bd163df98 /sound/soc/intel/boards | |
| parent | 60adcfde92fa40fcb2dbf7cc52f9b096e0cd109a (diff) | |
| parent | 85578bbd642f65065039b1765ebe1a867d5435b0 (diff) | |
| download | linux-e5dbdcb31285a975d623d2bf2c9e7b2940489008.tar.gz linux-e5dbdcb31285a975d623d2bf2c9e7b2940489008.tar.bz2 linux-e5dbdcb31285a975d623d2bf2c9e7b2940489008.zip | |
Merge tag 'asoc-fix-v5.5-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.5
This is mostly driver specific fixes, plus an error handling fix
in the core. There is a rather large diffstat for the stm32 SAI
driver, this is a very large but mostly mechanical update which
wraps every register access in the driver to allow a fix to the
locking which avoids circular locks, the active change is much
smaller and more reasonably sized.
Diffstat (limited to 'sound/soc/intel/boards')
| -rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 46612331f5ea..54e97455d7f6 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -442,7 +442,8 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "IRBIS"), DMI_MATCH(DMI_PRODUCT_NAME, "NB41"), }, - .driver_data = (void *)(BYT_CHT_ES8316_INTMIC_IN2_MAP + .driver_data = (void *)(BYT_CHT_ES8316_SSP0 + | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, { /* Teclast X98 Plus II */ |