diff options
| author | Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
| commit | 41d91ec3de8a90167159275bde7ed65768723556 (patch) | |
| tree | 6b3609b4317591e3f61edd11e230ad5e3289de09 /include/sound | |
| parent | 1e060a453c8604311fb45ae2f84f67ed673329b4 (diff) | |
| parent | ff5d18cb04f4ecccbcf05b7f83ab6df2a0d95c16 (diff) | |
| download | lwn-41d91ec3de8a90167159275bde7ed65768723556.tar.gz lwn-41d91ec3de8a90167159275bde7ed65768723556.zip | |
Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7
ASoC: tegra: Fixes for v5.7-rc3
This contains a couple of fixes that are needed to properly reconfigure
the audio clocks on older Tegra devices.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/core.h | 1 | ||||
| -rw-r--r-- | include/sound/pcm.h | 9 | ||||
| -rw-r--r-- | include/sound/pcm_params.h | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index ac8b692b69b4..381a010a1bd4 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -266,6 +266,7 @@ void snd_device_disconnect(struct snd_card *card, void *device_data); void snd_device_disconnect_all(struct snd_card *card); void snd_device_free(struct snd_card *card, void *device_data); void snd_device_free_all(struct snd_card *card); +int snd_device_get_state(struct snd_card *card, void *device_data); /* isadma.c */ diff --git a/include/sound/pcm.h b/include/sound/pcm.h index f7a95b711100..2ba5df2c9e23 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1427,6 +1427,15 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) return 1ULL << (__force int) pcm_format; } +/** + * pcm_for_each_format - helper to iterate for each format type + * @f: the iterator variable in snd_pcm_format_t type + */ +#define pcm_for_each_format(f) \ + for ((f) = SNDRV_PCM_FORMAT_FIRST; \ + (__force int)(f) <= (__force int)SNDRV_PCM_FORMAT_LAST; \ + (f) = (__force snd_pcm_format_t)((__force int)(f) + 1)) + /* printk helpers */ #define pcm_err(pcm, fmt, args...) \ dev_err((pcm)->card->dev, fmt, ##args) diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h index 661450a2095b..36f94735d23d 100644 --- a/include/sound/pcm_params.h +++ b/include/sound/pcm_params.h @@ -133,6 +133,13 @@ static inline int snd_mask_test(const struct snd_mask *mask, unsigned int val) return mask->bits[MASK_OFS(val)] & MASK_BIT(val); } +/* Most of drivers need only this one */ +static inline int snd_mask_test_format(const struct snd_mask *mask, + snd_pcm_format_t format) +{ + return snd_mask_test(mask, (__force unsigned int)format); +} + static inline int snd_mask_single(const struct snd_mask *mask) { int i, c = 0; |