summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
Commit message (Expand)AuthorAgeFilesLines
*-. Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc...Mark Brown2015-08-301-0/+4
|\ \
| | * ASoC: core: add snd_soc_of_parse_audio_prefix()Kuninori Morimoto2015-07-161-0/+4
| |/
| |
| \
*-. \ Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif...Mark Brown2015-08-301-4/+7
|\ \ \ | | |/ | |/|
| | * ASoC: Clean up docbook warningsJonathan Corbet2015-08-281-4/+7
| |/
| |
| \
*-. \ Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97', 'aso...Mark Brown2015-08-301-1/+2
|\ \ \ | | |/ | |/|
| | * ASoC: ac97: Add support for resetting device before registrationLars-Peter Clausen2015-07-231-1/+2
| |/
* | Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-nextMark Brown2015-08-301-7/+3
|\ \
| * | ASoC: Remove snd_soc_codec dapm fieldLars-Peter Clausen2015-07-071-7/+3
| |/
* / ASoC: Use card field to indicate whether a component is boundLars-Peter Clausen2015-07-081-1/+0
|/
*-. Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', '...Mark Brown2015-06-051-0/+11
|\ \
| * | ASoC: topology: Add topology coreLiam Girdwood2015-06-041-0/+11
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dpcm' int...Mark Brown2015-06-051-18/+21
|\ \ \ \ | | |_|/ | |/| |
| | * | ASoC: soc-pcm: DPCM cares BE formatKuninori Morimoto2015-05-221-0/+3
| | * | ASoC: soc.h: tidyup struct snd_soc_dai_link definition orderKuninori Morimoto2015-04-271-18/+18
| |/ /
* | | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown2015-06-051-3/+65
|\ \ \ | | |/ | |/|
| * | ASoC: dapm: Add support for autodisable mux controlsCharles Keepax2015-05-061-0/+10
| * | ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macroCharles Keepax2015-05-061-2/+2
| * | ASoC: Add helper functions bias level managementLars-Peter Clausen2015-04-271-0/+40
| * | ASoC: Add helper function getting CODEC's DAPM contextLars-Peter Clausen2015-04-271-1/+13
| |/
| |
| \
*-. \ Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fi...Mark Brown2015-04-291-0/+12
|\ \ \ | |_|/ |/| |
| | * ASoC: add static inline funcs to fix a compiling issueJie Yang2015-04-191-0/+12
* | | Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broo...Takashi Iwai2015-04-131-0/+14
|\| |
| | \
| | \
| *-. | Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090'...Mark Brown2015-04-121-0/+1
| |\ \|
| | * | ASoC: dapm: add code to configure dai link parametersNikesh Oswal2015-03-171-0/+1
| | |/
| * | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown2015-04-121-0/+13
| |\ \
| | * | ASoC: Make snd_soc_dapm_kcontrol_codec() inlineLars-Peter Clausen2015-03-161-0/+13
| | |/
* | | Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...Takashi Iwai2015-03-061-3/+13
|\| |
| | \
| | \
| | \
| | \
| | \
| | \
| *-----. | Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'as...Mark Brown2015-03-051-3/+5
| |\ \ \ \|
| | * | | | ASoC: Remove snd_soc_jack_new()Lars-Peter Clausen2015-03-041-20/+0
| | * | | | ASoC: Allow to register jacks at the card levelLars-Peter Clausen2015-03-041-3/+25
| | | |_|/ | | |/| |
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----. \ \ \ Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'aso...Mark Brown2015-03-051-0/+3
| |\ \ \ \ \ \ \ | | | | | |/ / / | | | | |/| / / | | | | |_|/ / | | | |/| | / | | | |_|_|/ | | |/| | |
| | | | | * ASoC: core: allow pcms to be registered as nonatomicVinod Koul2015-02-241-0/+3
| | | | |/
| | | | |
| | | | \
| | | *-. \ Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'as...Mark Brown2015-02-091-0/+3
| | | |\ \ \ | | | |/ / / | | |/| | |
| * | | | | ASoC: core: Add extra dapm properties for Device TreeNicolin Chen2015-02-241-0/+5
| | |_|_|/ | |/| | |
* / | | | ALSA: Fix spelling typo in Documentation/DocBook/alsa-driver-api.xmlMasanari Iida2015-03-041-1/+1
|/ / / /
| | | |
| \ \ \
*-. \ \ \ Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'as...Mark Brown2015-02-041-0/+3
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | / | | |/
| | * ASoC: Add helper function for changing the DAI link formatLars-Peter Clausen2015-01-071-0/+3
| |/
* / ASoC: Add support for allocating AC'97 device before registering itLars-Peter Clausen2015-01-261-0/+1
|/
*-. Merge remote-tracking branches 'asoc/topic/multi-codec', 'asoc/topic/mxs-saif...Mark Brown2014-12-081-0/+3
|\ \
| * | ASoC: core: add multi-codec support in DTJean-Francois Moine2014-11-251-0/+3
| |/
| |
| \
*-. | Merge remote-tracking branches 'asoc/topic/codec-mutex', 'asoc/topic/compress...Mark Brown2014-12-081-1/+0
|\ \|
| * | ASoC: Remove CODEC mutexLars-Peter Clausen2014-11-101-1/+0
| |/
| |
| \
*-. | Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/...Mark Brown2014-12-081-8/+56
|\ \|
| * | ASoC: Disable regmap helpers if regmap is disabledLars-Peter Clausen2014-11-251-0/+4
| * | Merge branch 'topic/regmap' of git://git.kernel.org/pub/scm/linux/kernel/git/...Mark Brown2014-11-191-0/+35
| |\ \
| | * | ASoC: Add helper functions for deferred regmap setupLars-Peter Clausen2014-11-191-0/+35
| | |/
| * | ASoC: ac97: Push snd_ac97 pointer to the driver levelLars-Peter Clausen2014-11-181-3/+2
| * | ASoC: ac97: Drop delayed device registrationLars-Peter Clausen2014-11-181-10/+0
| * | ASoC: ac97: Drop support for setting platform data via the CPU DAILars-Peter Clausen2014-11-181-3/+0
| * | ASoC: ac97: Use static ac97_busLars-Peter Clausen2014-11-181-2/+1