diff options
-rw-r--r-- | include/sound/soc.h | 5 | ||||
-rw-r--r-- | sound/soc/Makefile | 2 | ||||
-rw-r--r-- | sound/soc/soc-utils.c | 68 |
3 files changed, 74 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 7f3a4c5028da..310a21949a3e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -227,6 +227,11 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, | |||
227 | void snd_soc_free_pcms(struct snd_soc_device *socdev); | 227 | void snd_soc_free_pcms(struct snd_soc_device *socdev); |
228 | int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid); | 228 | int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid); |
229 | 229 | ||
230 | /* Utility functions to get clock rates from various things */ | ||
231 | int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); | ||
232 | int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params); | ||
233 | int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms); | ||
234 | |||
230 | /* set runtime hw params */ | 235 | /* set runtime hw params */ |
231 | int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, | 236 | int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, |
232 | const struct snd_pcm_hardware *hw); | 237 | const struct snd_pcm_hardware *hw); |
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 0c5eac01bf2e..1470141d4167 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o | 1 | snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o |
2 | 2 | ||
3 | obj-$(CONFIG_SND_SOC) += snd-soc-core.o | 3 | obj-$(CONFIG_SND_SOC) += snd-soc-core.o |
4 | obj-$(CONFIG_SND_SOC) += codecs/ | 4 | obj-$(CONFIG_SND_SOC) += codecs/ |
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c new file mode 100644 index 000000000000..b16aaaeb0aab --- /dev/null +++ b/sound/soc/soc-utils.c | |||
@@ -0,0 +1,68 @@ | |||
1 | /* | ||
2 | * soc-util.c -- ALSA SoC Audio Layer utility functions | ||
3 | * | ||
4 | * Copyright 2009 Wolfson Microelectronics PLC. | ||
5 | * | ||
6 | * Author: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
7 | * Liam Girdwood <lrg@slimlogic.co.uk> | ||
8 | * | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify it | ||
11 | * under the terms of the GNU General Public License as published by the | ||
12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
13 | * option) any later version. | ||
14 | */ | ||
15 | |||
16 | #include <sound/core.h> | ||
17 | #include <sound/pcm.h> | ||
18 | #include <sound/pcm_params.h> | ||
19 | #include <sound/soc.h> | ||
20 | |||
21 | int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots) | ||
22 | { | ||
23 | return sample_size * channels * tdm_slots; | ||
24 | } | ||
25 | EXPORT_SYMBOL_GPL(snd_soc_calc_frame_size); | ||
26 | |||
27 | int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params) | ||
28 | { | ||
29 | int sample_size; | ||
30 | |||
31 | switch (params_format(params)) { | ||
32 | case SNDRV_PCM_FORMAT_S16_LE: | ||
33 | case SNDRV_PCM_FORMAT_S16_BE: | ||
34 | sample_size = 16; | ||
35 | break; | ||
36 | case SNDRV_PCM_FORMAT_S20_3LE: | ||
37 | case SNDRV_PCM_FORMAT_S20_3BE: | ||
38 | sample_size = 20; | ||
39 | break; | ||
40 | case SNDRV_PCM_FORMAT_S24_LE: | ||
41 | case SNDRV_PCM_FORMAT_S24_BE: | ||
42 | sample_size = 24; | ||
43 | break; | ||
44 | case SNDRV_PCM_FORMAT_S32_LE: | ||
45 | case SNDRV_PCM_FORMAT_S32_BE: | ||
46 | sample_size = 32; | ||
47 | break; | ||
48 | default: | ||
49 | return -ENOTSUPP; | ||
50 | } | ||
51 | |||
52 | return snd_soc_calc_frame_size(sample_size, params_channels(params), | ||
53 | 1); | ||
54 | } | ||
55 | EXPORT_SYMBOL_GPL(snd_soc_params_to_frame_size); | ||
56 | |||
57 | int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params) | ||
58 | { | ||
59 | int ret; | ||
60 | |||
61 | ret = snd_soc_params_to_frame_size(params); | ||
62 | |||
63 | if (ret > 0) | ||
64 | return ret * params_rate(params); | ||
65 | else | ||
66 | return ret; | ||
67 | } | ||
68 | EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk); | ||