summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)AuthorFilesLines
2013-07-11ASoC: omap-mcpdm: Do not use platform_get_resource_byname() for DMAPeter Ujfalusi1-14/+2
The DMA resource no longer available via this API when booting with DT. McPDM is only available on OMAP4/5 and both can boot with DT only. Set the dma_data.filter_data to the DMA name which will be used by omap-pcm to request the DMA channel. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-11ASoC: omap-pcm: Request the DMA channel differently when DT is involvedPeter Ujfalusi1-3/+14
When booting with DT the platform_get_resource_byname() is not available to get the DMA resource. In this case the DAI drivers will set the filter_data to the name of the DMA and omap-pcm can use this to request the DMA channel. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17Merge remote-tracking branch 'asoc/topic/x86' into asoc-nextMark Brown1-1/+0
2013-06-17Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-nextMark Brown2-43/+148
2013-06-17Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown1-30/+82
2013-06-17Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown1-0/+10
2013-06-17Merge remote-tracking branch 'asoc/topic/ux500' into asoc-nextMark Brown8-205/+159
2013-06-17Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown3-18/+56
2013-06-17Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-nextMark Brown4-0/+882
2013-06-17Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown7-193/+52
2013-06-17Merge remote-tracking branch 'asoc/topic/spdif' into asoc-nextMark Brown3-1/+21
2013-06-17Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown4-20/+16
2013-06-17Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-nextMark Brown3-84/+217
2013-06-17Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-2/+14
2013-06-17Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown7-0/+4495
2013-06-17Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown7-408/+4
2013-06-17Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown2-3/+0
2013-06-17Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-62/+1
2013-06-17Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown1-4/+20
2013-06-17Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown1-1/+1
2013-06-17Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-nextMark Brown2-11/+8
2013-06-17Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-nextMark Brown4-18/+18
2013-06-17Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown18-231/+466
2013-06-17Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown1-3/+7
2013-06-17Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown4-151/+21
2013-06-17Merge remote-tracking branch 'asoc/topic/dwc' into asoc-nextMark Brown1-3/+3
2013-06-17Merge remote-tracking branch 'asoc/topic/dfmbcs320' into asoc-nextMark Brown5-20/+29
2013-06-17Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown4-195/+2
2013-06-17Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown1-31/+30
2013-06-17Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown4-136/+121
2013-06-17Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-nextMark Brown19-930/+277
2013-06-17Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown1-9/+0
2013-06-17Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown4-2/+405
2013-06-17Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown2-7/+455
2013-06-17Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-nextMark Brown1-6/+63
2013-06-17Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown1-7/+2
2013-06-17Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linusMark Brown1-11/+24
2013-06-17Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linusMark Brown1-0/+2
2013-06-17Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linusMark Brown1-1/+1
2013-06-17Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linusMark Brown1-1/+1
2013-06-17ASoC: spear: Convert to use devm_ioremap_resourceTushar Behera1-15/+4
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). devm_request_mem_region is called in devm_ioremap_resource(). Hence that part can also be removed. Since devm_ioremap_resource prints error message on failure, there is no need to print an explicit warning message. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: alsa-devel@alsa-project.org CC: Liam Girdwood <lgirdwood@gmail.com> CC: Mark Brown <broonie@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: spear: Normalise module namesMark Brown1-3/+7
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: davinci: remove sffsdr machine supportSekhar Nori3-193/+0
sffsdr machine support does not build since at least v2.6.36 (~3 years). There is little hope of it being fixed, so remove the support. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17ASoC: spear: Remove nonexistant EVM optionsMark Brown2-24/+0
The source wasn't added. Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-15Merge branch 'for-linus' of ↵Linus Torvalds1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull VFS fixes from Al Viro: "Several fixes + obvious cleanup (you've missed a couple of open-coded can_lookup() back then)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: snd_pcm_link(): fix a leak... use can_lookup() instead of direct checks of ->i_op->lookup move exit_task_namespaces() outside of exit_notify() fput: task_work_add() can fail if the caller has passed exit_task_work() ncpfs: fix rmdir returns Device or resource busy
2013-06-15snd_pcm_link(): fix a leak...Al Viro1-2/+2
in case when snd_pcm_stream_linked(substream) is true, we end up leaking group. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2013-06-14ASoC: wm5110: Correct rate control for DSP4Charles Keepax1-1/+1
Reported-by: Dennis May <dennis.may@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-14ASoC: wm8962: Enable start-up and normal bias after reset in runtime resumeNicolin Chen1-0/+11
This part of bias settings are essential for WM8962 to power up. Without it "wm8962 0-001a: DC servo timed out" might be prompted due to power-up failure that happens to FLL if being used. The driver's also bringing the bias down in the suspend path so it needs to be powered up in the resume path for symmetry. According to dapm_pre_sequence_async(), DAPM would call pm_runtime_get_sync() to let driver finish the bias settings in pm_runtime_resume() before the bias level being set to STANDBY. So no need to worry about disordered settings for VMID of WM8962. Signed-off-by: Nicolin Chen <b42378@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-14ASoC: dapm: Add snd_soc_dapm_switch to the power up/down sequence tableLars-Peter Clausen1-0/+2
The power up/down sequence order for DAPM switch widgets is not explicitly initialized, causing them to be run always as the first widget type for both power up and down. Move it to the same position in the sequence as other mixer widget types. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-14ASoC: dapm: Remove unused long_name field from snd_soc_dapm_path structLars-Peter Clausen1-4/+1
Since commit 85762e71 ("ASoC: dapm: Implement mixer control sharing") the long_name field of the snd_soc_dapm_path struct is unused. All of the name handling now happens entirely in dapm_create_or_share_mixmux_kcontrol(). So we can remove the long_name field from the snd_soc_dapm_path struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>