diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:21:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-03-03 14:21:13 +0100 |
| commit | fb2e5fc8c8d9d5f95c7a2e1ed6f45b2b3ba836a8 (patch) | |
| tree | 636387e1c12bfe74304e6d56b445f94f50b10466 /sound/soc/codecs/da7219-aad.h | |
| parent | 26ed1d29fc44f3f2f0c396c1392abefac5f0454e (diff) | |
| parent | b56ec2992a2e43bc3e60d6db86849d31640e791f (diff) | |
| download | lwn-fb2e5fc8c8d9d5f95c7a2e1ed6f45b2b3ba836a8.tar.gz lwn-fb2e5fc8c8d9d5f95c7a2e1ed6f45b2b3ba836a8.zip | |
Merge tag 'asoc-fix-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.3
Almost all of this is driver specific fixes and new IDs that have come
in during the merge window. A good chunk of them are simple ones from
me which came about due to a bunch of Mediatek Chromebooks being enabled
in KernelCI, there's more where that came from.
We do have one small feature added to the PCM core by Claudiu Beznea in
order to allow the sequencing required to resolve a noise issue with the
Microchip PDMC driver.
Diffstat (limited to 'sound/soc/codecs/da7219-aad.h')
| -rw-r--r-- | sound/soc/codecs/da7219-aad.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/da7219-aad.h b/sound/soc/codecs/da7219-aad.h index 21fdf53095cc..be87ee47edde 100644 --- a/sound/soc/codecs/da7219-aad.h +++ b/sound/soc/codecs/da7219-aad.h @@ -11,6 +11,7 @@ #define __DA7219_AAD_H #include <linux/timer.h> +#include <linux/mutex.h> #include <sound/soc.h> #include <sound/jack.h> #include <sound/da7219-aad.h> @@ -196,6 +197,9 @@ struct da7219_aad_priv { struct work_struct btn_det_work; struct work_struct hptest_work; + struct work_struct jack_det_work; + + struct mutex jack_det_mutex; struct snd_soc_jack *jack; bool micbias_resume_enable; |