summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown2014-01-202-0/+23
|\
| * ASoC: compress: Add suport for DPCM into compressed audioLiam Girdwood2014-01-171-0/+1
| * ASoC: DPCM: make some DPCM API calls non static for compressed usageLiam Girdwood2014-01-171-0/+22
* | Merge branch 'for-next' into for-linusTakashi Iwai2014-01-2018-41/+849
|\ \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| *-------------. \ Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/t...Mark Brown2014-01-162-10/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | | | | | | * | ARM: ux500: Don't use enums for MSP IDs - for easy DT conversionLee Jones2014-01-071-8/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| | | | | | | * | ASoC: twl4030: Remove reset registers functionalityPeter Ujfalusi2014-01-081-1/+0
| | | | | | | * | ASoC: twl4030: Remove check defaults functionalityPeter Ujfalusi2014-01-081-1/+0
| | | | | | | * | mfd: twl-core: API to set the regcache bypass for a given regmap in twlPeter Ujfalusi2014-01-081-0/+3
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'asoc/topic/arizona' into for-tiwaiMark Brown2014-01-161-0/+27
| |\ \ \ \ \ \ \
| | * | | | | | | mfd: wm5110: Add registers for headphone short circuit controlCharles Keepax2014-01-101-0/+27
| | * | | | | | | Merge tag 'v3.13-rc3' into asoc-arizonaMark Brown2014-01-1034-103/+245
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwaiMark Brown2014-01-162-0/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ALSA: Add helper function for intersecting two rate masksLars-Peter Clausen2014-01-141-0/+2
| | * | | | | | | | | Merge tag 'v3.13-rc3' into asoc-pcmMark Brown2014-01-1434-103/+245
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | ASoC: dpcm: Explicitly set BE DAI link supported stream directionsLiam Girdwood2014-01-071-0/+4
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'asoc/topic/dma' into for-tiwaiMark Brown2014-01-161-0/+28
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | dma: Indicate residue granularity in dma_slave_capsLars-Peter Clausen2014-01-141-0/+28
| * | | | | | | | | | Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwaiMark Brown2014-01-162-0/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ASoC: sapm: Automatically connect DAI link widgets in DAPM graph.Liam Girdwood2014-01-081-0/+1
| | * | | | | | | | | | ASoC: utils: Add internal call to determine if DAI is dummy.Liam Girdwood2014-01-081-0/+2
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | ALSA: Remove memory reservation code from memalloc helperTakashi Iwai2014-01-092-8/+0
| * | | | | | | | | | ALSA: compress: add num_sample_rates in snd_codec_descVinod Koul2014-01-071-0/+2
| * | | | | | | | | | ALSA: compress: update struct snd_codec_desc for sample rateVinod Koul2014-01-051-1/+2
| * | | | | | | | | | ALSA: compress: update comment for sample rate in snd_codecVinod Koul2014-01-051-1/+2
| * | | | | | | | | | Merge tag 'asoc-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...Takashi Iwai2014-01-0529-68/+348
| |\ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \
| | *-----------------------. \ \ \ \ \ \ \ \ \ Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'aso...Mark Brown2014-01-028-20/+194
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | / / / / / / | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | / / / / / | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | | | / / / / | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / | | | | | | | | |/| | | | | | | | | / / / | | | | | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | | | | | |/| | | | | | | | / / | | | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | | | |/| | | / | | | | | | | | | | | | | | | | |_|/ | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | * | | ALSA: Add params_width() helpersMark Brown2013-12-301-0/+12
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | ASoC: SPEAr: remove custom DMA alloc compat functionStephen Warren2013-12-181-1/+0
| | | | | | |_|_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | | |
| | | | | | | | | | | | * | | | ASoC: rsnd: add SRC (Sampling Rate Converter) supportKuninori Morimoto2013-12-311-0/+1
| | | | | | | | | | | | * | | | ASoC: rcar: rename GEN2_SRU to GEN2_SCUKuninori Morimoto2013-11-201-1/+1
| | | | | | | | | | | * | | | | ASoC: mcbsp: Trivial cleanup in asoc-ti-mcbsp.hSachin Kamat2013-12-301-4/+2
| | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |
| | | | | | | | | | * | | | | ASoC: Fix build without CONFIG_GPIOLIBTakashi Iwai2013-11-251-4/+11
| | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | | | | | | * | | | | | Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-fslMark Brown2013-12-032-0/+8
| | | | | | |_|/| | | | | | | | | | | |/| | | | |/ / / | | | | | | | | | |/| | | | | | | | | | | |/| | | |
| | | | | | | * / | | | | ASoC: davinci-mcasp: Support for McASP version found in DRA7xxPeter Ujfalusi2013-12-101-0/+1
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | | | | * | | | | | ASoC: cs42l52: Make MICA/B mixer dependent on mic configBrian Austin2013-11-281-4/+4
| | | | | | * | | | | | ASoC: cs42l52: Reorganize MICA/B Config and SelectBrian Austin2013-11-281-6/+0
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | mfd: wm5110: Expose DRE control registersCharles Keepax2013-12-191-0/+4
| | | | * | | | | | | Merge tag 'v3.13-rc1' into asoc-arizonaMark Brown2013-11-24567-7142/+15924
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-ari...Mark Brown2013-11-2117-33/+99
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | ASoC: wm5110: Expose input high pass filter controlsCharles Keepax2013-11-211-0/+37
| | | | * | | | | | | | ASoC: wm5110: Add extra AIF2 channelsRichard Fitzgerald2013-11-201-0/+121
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown2014-01-022-0/+18
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'topic/defer_probe' of git://git.infradead.org/users/vkoul/slave...Mark Brown2013-12-111-0/+8
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | dma: add channel request API that supports deferred probeStephen Warren2013-12-101-0/+8
| | | | |/ / / / / / /
| | | * | | | / / / / ASoC: dmaengine: add custom DMA config to snd_dmaengine_pcm_configStephen Warren2013-12-091-0/+6
| | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | ASoC: Add resource managed snd_dmaengine_pcm_register()Lars-Peter Clausen2013-11-281-0/+4
| | | |/ / / / / /
| | * | | | | | | Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown2014-01-022-0/+8
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | ASoC: soc-pcm: add symmetry for channels and sample bitsNicolin Chen2013-11-242-0/+8
| | | |/ / / / /
| * | | | | | | Merge branch 'for-linus' into for-nextTakashi Iwai2014-01-0527-91/+108
| |\ \ \ \ \ \ \