aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-07 12:31:10 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-09 05:31:31 -0500
commit8a2cd6180f8fa00111843c2f4a4f4361995358e0 (patch)
tree4f2bf5e1843b4bba34a7d42b8bba1af283f6e747 /include
parent1649923dd52ce914be98bff0ae352344ef04f305 (diff)
ASoC: Add jack reporting interface
This patch adds a jack reporting interface to ASoC. This wraps the ALSA core jack detection functionality and provides integration with DAPM to automatically update the power state of pins based on the jack state. Since embedded platforms can have multiple detecton methods used for a single jack (eg, separate microphone and headphone detection) the report function allows specification of which bits are being updated on a given report. The expected usage is that machine drivers will create jack objects and then configure jack detection methods to update that jack. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h32
1 files changed, 32 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9b930d342116..9c3ef6a3e9fb 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -154,6 +154,8 @@ enum snd_soc_bias_level {
154 SND_SOC_BIAS_OFF, 154 SND_SOC_BIAS_OFF,
155}; 155};
156 156
157struct snd_jack;
158struct snd_soc_card;
157struct snd_soc_device; 159struct snd_soc_device;
158struct snd_soc_pcm_stream; 160struct snd_soc_pcm_stream;
159struct snd_soc_ops; 161struct snd_soc_ops;
@@ -164,6 +166,8 @@ struct snd_soc_platform;
164struct snd_soc_codec; 166struct snd_soc_codec;
165struct soc_enum; 167struct soc_enum;
166struct snd_soc_ac97_ops; 168struct snd_soc_ac97_ops;
169struct snd_soc_jack;
170struct snd_soc_jack_pin;
167 171
168typedef int (*hw_write_t)(void *,const char* ,int); 172typedef int (*hw_write_t)(void *,const char* ,int);
169typedef int (*hw_read_t)(void *,char* ,int); 173typedef int (*hw_read_t)(void *,char* ,int);
@@ -184,6 +188,13 @@ int snd_soc_init_card(struct snd_soc_device *socdev);
184int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, 188int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
185 const struct snd_pcm_hardware *hw); 189 const struct snd_pcm_hardware *hw);
186 190
191/* Jack reporting */
192int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
193 struct snd_soc_jack *jack);
194void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
195int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
196 struct snd_soc_jack_pin *pins);
197
187/* codec IO */ 198/* codec IO */
188#define snd_soc_read(codec, reg) codec->read(codec, reg) 199#define snd_soc_read(codec, reg) codec->read(codec, reg)
189#define snd_soc_write(codec, reg, value) codec->write(codec, reg, value) 200#define snd_soc_write(codec, reg, value) codec->write(codec, reg, value)
@@ -239,6 +250,27 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
239int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, 250int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
240 struct snd_ctl_elem_value *ucontrol); 251 struct snd_ctl_elem_value *ucontrol);
241 252
253/**
254 * struct snd_soc_jack_pin - Describes a pin to update based on jack detection
255 *
256 * @pin: name of the pin to update
257 * @mask: bits to check for in reported jack status
258 * @invert: if non-zero then pin is enabled when status is not reported
259 */
260struct snd_soc_jack_pin {
261 struct list_head list;
262 const char *pin;
263 int mask;
264 bool invert;
265};
266
267struct snd_soc_jack {
268 struct snd_jack *jack;
269 struct snd_soc_card *card;
270 struct list_head pins;
271 int status;
272};
273
242/* SoC PCM stream information */ 274/* SoC PCM stream information */
243struct snd_soc_pcm_stream { 275struct snd_soc_pcm_stream {
244 char *stream_name; 276 char *stream_name;