summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
*-. Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into a...Mark Brown2014-03-251-1/+1
|\ \
| * | ASoC: core: remove the 'of_' prefix of of_xlate_tdm_slot_mask.Xiubo Li2014-03-251-1/+1
* | | Merge tag 'asoc-v3.15-3' into asoc-nextMark Brown2014-03-251-0/+13
|\| |
| * | Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown2014-03-231-0/+13
| |\ \
| | * | ASoC: Add helper function to cast component back to CODECLars-Peter Clausen2014-03-191-0/+13
| * | | Merge tag 'asoc-v3.15-2' into asoc-nextMark Brown2014-03-232-10/+11
| |\ \ \
| * \ \ \ Merge tag 'asoc-v3.15' into asoc-nextMark Brown2014-03-2314-78/+736
| |\ \ \ \
* | \ \ \ \ Merge tag 'asoc-v3.15-2' into asoc-nextMark Brown2014-03-252-10/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-nextMark Brown2014-03-131-0/+8
| |\ \ \ \ \
| | * | | | | ASoC: tlv320aic31xx: Add basic codec driver implementationJyri Sarha2014-03-131-0/+8
| * | | | | | Merge remote-tracking branch 'asoc/topic/jack' into asoc-nextMark Brown2014-03-131-1/+2
| |\ \ \ \ \ \
| | * | | | | | ASoC: add data field into snd_soc_jack_gpioxiangxiao2014-02-241-1/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge remote-tracking branch 'asoc/topic/io' into asoc-nextMark Brown2014-03-131-9/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | ASoC: io: New signature for snd_soc_codec_set_cache_io()Xiubo Li2014-03-111-6/+1
| | | | | | |
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 't...Mark Brown2014-03-111-0/+15
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | * | | | | ASoC: io: Remove hw_read() operationMark Brown2014-03-041-1/+0
| | * | | | | ASoC: io: Remove SND_SOC_I2CMark Brown2014-02-231-1/+0
| | * | | | | ASoC: io: Remove SPI supportMark Brown2014-02-161-1/+0
| | |/ / / /
* | | | | | Merge tag 'asoc-v3.15' into asoc-nextMark Brown2014-03-2514-78/+736
|\| | | | |
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *---. \ \ \ \ Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', '...Mark Brown2014-03-123-8/+4
| |\ \ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | ASoC: simple-card: add slot information parsing supportsXiubo Li2014-02-231-0/+2
| | | | * | | | Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broo...Mark Brown2014-02-232-0/+5
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broo...Mark Brown2014-02-101-0/+2
| | | | |\ \ \ \ \
| | | | * | | | | | ASoC: simple-card: simplify codeJean-Francois Moine2014-02-031-4/+0
| | | |/ / / / / /
| | * | | | | | | ASoC: s3c24xx: Remove invalid file referenceSachin Kamat2014-02-251-2/+1
| | * | | | | | | ASoC: samsung: Remove invalid file referenceSachin Kamat2014-02-251-2/+1
| | |/ / / / / /
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---. \ \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/t...Mark Brown2014-03-125-6/+569
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | ASoC: rsnd: rename scu to srcKuninori Morimoto2014-03-051-7/+11
| | | | * | | | | ASoC: rsnd: Get correct SCU IDKuninori Morimoto2014-03-051-0/+1
| | | | * | | | | ASoC: rsnd: add struct rsnd_dai_platform_infoKuninori Morimoto2014-03-051-1/+16
| | | | * | | | | ASoC: rsnd: tidyup RSND_SSI_xxx flagsKuninori Morimoto2014-03-031-3/+0
| | | | * | | | | ASoC: rsnd: add Gen2 SRC and DMAEngine supportKuninori Morimoto2014-02-031-0/+6
| | | | * | | | | ASoC: rsnd: remove pin sync optionKuninori Morimoto2014-02-031-0/+1
| | | |/ / / / / | | |/| | | | |
| | | * | | | | ASoC: core: add TDM slot parsing from DT supportsXiubo Li2014-02-232-0/+5
| | | |/ / / /
| | | * / / / ASoC: add snd_soc_of_parse_audio_simple_widgets for DTXiubo Li2014-02-101-0/+2
| | |/ / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'aso...Mark Brown2014-03-121-1/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | ASoC: davinci-mcasp: Rename platform data structPeter Ujfalusi2014-02-031-1/+3
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. | | | | | Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'aso...Mark Brown2014-03-122-3/+4
| |\ \ \| | | | |
| | | * | | | | | ASoC: atmel_ssc_dai: make option to choose clockBo Shen2014-02-121-0/+1
| | | |/ / / / /
| | * / / / / / mfd: arizona: Add support for new fratio encodingCharles Keepax2014-03-091-3/+3
| | |/ / / / /
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'a...Mark Brown2014-03-121-0/+45
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | ASoC: Add ADAU1977 CODEC driverLars-Peter Clausen2014-02-191-0/+45
| | |/ / / / /
| * | | | | | Merge remote-tracking branch 'asoc/topic/enum' into asoc-nextMark Brown2014-03-122-57/+67
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/bro...Mark Brown2014-03-062-2/+21
| | |\ \ \ \ \ \
| | * | | | | | | ASoC: dapm: Consolidate MUXs and virtual MUXsLars-Peter Clausen2014-03-011-18/+5
| | * | | | | | | ASoC: Add macros for defining virtual enumsLars-Peter Clausen2014-03-011-1/+5
| | * | | | | | | ASoC: dapm: Consolidate MUXs and value MUXsLars-Peter Clausen2014-03-011-13/+2
| | * | | | | | | ASoC: Consolidate enum and value enum controlsLars-Peter Clausen2014-03-011-9/+25
| | * | | | | | | ASoC: Remove unused 'reg2' field from soc_enum structLars-Peter Clausen2014-03-011-1/+0
| | | | | | | | |
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | *---. \ \ \ \ \ \ Merge branches 'topic/dapm', 'topic/sign', 'topic/adau1373', 'topic/max98090'...Mark Brown2014-03-012-0/+35
| | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | / / / | | | | | |_|_|/ / / | | | | |/| | | | |