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/codecs/cros_ec_codec.c | |
parent | 60adcfde92fa40fcb2dbf7cc52f9b096e0cd109a (diff) | |
parent | 85578bbd642f65065039b1765ebe1a867d5435b0 (diff) | |
download | linux-e5dbdcb31285a975d623d2bf2c9e7b2940489008.tar.bz2 |
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/codecs/cros_ec_codec.c')
-rw-r--r-- | sound/soc/codecs/cros_ec_codec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index 7b17f39a6a10..ce3ed056ea8b 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -10,6 +10,7 @@ #include <crypto/hash.h> #include <crypto/sha.h> +#include <linux/acpi.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/io.h> @@ -1047,10 +1048,17 @@ static const struct of_device_id cros_ec_codec_of_match[] = { MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match); #endif +static const struct acpi_device_id cros_ec_codec_acpi_id[] = { + { "GOOG0013", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, cros_ec_codec_acpi_id); + static struct platform_driver cros_ec_codec_platform_driver = { .driver = { .name = "cros-ec-codec", .of_match_table = of_match_ptr(cros_ec_codec_of_match), + .acpi_match_table = ACPI_PTR(cros_ec_codec_acpi_id), }, .probe = cros_ec_codec_platform_probe, }; |