diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:37:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:37:37 -0400 |
commit | dbf7b5915b39bfff548e4c6a3a753fc291a60e25 (patch) | |
tree | 55c457a22aa869d2ab558317877138369ae5f9bb /include/linux/mfd | |
parent | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (diff) | |
parent | c1b623d9e4117d18d244e9b7fb30d2c27aeaf074 (diff) |
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound update from Takashi Iwai:
"This is a fairly quiet release in all sound area. Only a little bit
of changes in the core side while most of changes are seen in the
drivers.
HD-audio:
- A few new codec additions for Nvidia, Realtek and VIA
- Intel Haswell audio support
- Support for "phantom" jacks for consistent jack reporting
- Major clean-ups in HDMI/DP driver codes
- A workaround for inverted digital-mic pins with Realtek codecs
- Removal of beep_mode=2 option
ASoC:
- Added the ability to add and remove DAPM paths dynamically, mostly
for reparenting on clock changes
- New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
reference platform and ttc-dkp
- New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
- New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500,
TI Isabelle and Wolfson Microelectronics WM5102 and WM5110
- DAPM fixes for the recent locking changes
- Fix for _PRE and _POST widgets (which have been broken for a few
releases now)
- A couple of minor driver updates
Misc
- Conversion to new dev_pm_ops in platform and PCI drivers
- LTC support and some fixes in PCXHR driver
- A few fixes and PM support for ISA OPti9xx and WSS cards
- Some TLV code cleanup
- Move driver-specific headers from include/sound to local dirs"
* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (212 commits)
ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
ALSA: hda - add dock support for Thinkpad X230 Tablet
ALSA: hda - Turn on PIN_OUT from hdmi playback prepare.
ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define
ASoC: littlemill: Add userspace control of the WM1250 I/O
ASoC: wm8994: Update micdet for irqdomain conversion
ALSA: hda - make sure alc268 does not OOPS on codec parse
ALSA: hda - Add support for Realtek ALC282
ALSA: hda - Fix index number conflicts of phantom jacks
ALSA: opti9xx: Fix section mismatch by PM support
ALSA: snd-opti9xx: Implement suspend/resume
ALSA: hda - Add new GPU codec ID to snd-hda
ALSA: hda - Fix driver type of Haswell controller to AZX_DRIVER_SCH
ALSA: hda - add Haswell HDMI codec id
ALSA: hda - Add DeviceID for Haswell HDA
ALSA: wss_lib: Fix resume on Yamaha OPL3-SAx
ALSA: wss_lib: fix suspend/resume
ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
ALSA: tlv: add DECLARE_TLV_DB_RANGE()
ALSA: tlv: add DECLARE_TLV_CONTAINER()
...
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/abx500/ab8500-codec.h | 52 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 |
2 files changed, 54 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab8500-codec.h b/include/linux/mfd/abx500/ab8500-codec.h new file mode 100644 index 000000000000..dc6529202cdd --- /dev/null +++ b/include/linux/mfd/abx500/ab8500-codec.h | |||
@@ -0,0 +1,52 @@ | |||
1 | /* | ||
2 | * Copyright (C) ST-Ericsson SA 2012 | ||
3 | * | ||
4 | * Author: Ola Lilja <ola.o.lilja@stericsson.com> | ||
5 | * for ST-Ericsson. | ||
6 | * | ||
7 | * License terms: | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License version 2 as published | ||
11 | * by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef AB8500_CORE_CODEC_H | ||
15 | #define AB8500_CORE_CODEC_H | ||
16 | |||
17 | /* Mic-types */ | ||
18 | enum amic_type { | ||
19 | AMIC_TYPE_SINGLE_ENDED, | ||
20 | AMIC_TYPE_DIFFERENTIAL | ||
21 | }; | ||
22 | |||
23 | /* Mic-biases */ | ||
24 | enum amic_micbias { | ||
25 | AMIC_MICBIAS_VAMIC1, | ||
26 | AMIC_MICBIAS_VAMIC2 | ||
27 | }; | ||
28 | |||
29 | /* Bias-voltage */ | ||
30 | enum ear_cm_voltage { | ||
31 | EAR_CMV_0_95V, | ||
32 | EAR_CMV_1_10V, | ||
33 | EAR_CMV_1_27V, | ||
34 | EAR_CMV_1_58V | ||
35 | }; | ||
36 | |||
37 | /* Analog microphone settings */ | ||
38 | struct amic_settings { | ||
39 | enum amic_type mic1_type; | ||
40 | enum amic_type mic2_type; | ||
41 | enum amic_micbias mic1a_micbias; | ||
42 | enum amic_micbias mic1b_micbias; | ||
43 | enum amic_micbias mic2_micbias; | ||
44 | }; | ||
45 | |||
46 | /* Platform data structure for the audio-parts of the AB8500 */ | ||
47 | struct ab8500_codec_platform_data { | ||
48 | struct amic_settings amics; | ||
49 | enum ear_cm_voltage ear_cmv; | ||
50 | }; | ||
51 | |||
52 | #endif | ||
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 91dd3ef63e99..bc9b84b60ec6 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
@@ -266,6 +266,7 @@ struct ab8500 { | |||
266 | struct regulator_reg_init; | 266 | struct regulator_reg_init; |
267 | struct regulator_init_data; | 267 | struct regulator_init_data; |
268 | struct ab8500_gpio_platform_data; | 268 | struct ab8500_gpio_platform_data; |
269 | struct ab8500_codec_platform_data; | ||
269 | 270 | ||
270 | /** | 271 | /** |
271 | * struct ab8500_platform_data - AB8500 platform data | 272 | * struct ab8500_platform_data - AB8500 platform data |
@@ -284,6 +285,7 @@ struct ab8500_platform_data { | |||
284 | int num_regulator; | 285 | int num_regulator; |
285 | struct regulator_init_data *regulator; | 286 | struct regulator_init_data *regulator; |
286 | struct ab8500_gpio_platform_data *gpio; | 287 | struct ab8500_gpio_platform_data *gpio; |
288 | struct ab8500_codec_platform_data *codec; | ||
287 | }; | 289 | }; |
288 | 290 | ||
289 | extern int __devinit ab8500_init(struct ab8500 *ab8500, | 291 | extern int __devinit ab8500_init(struct ab8500 *ab8500, |