summaryrefslogtreecommitdiffstats
path: root/sound
AgeCommit message (Collapse)AuthorFilesLines
2013-06-20Merge tag 'davinci-for-v3.11/soc-v2' of ↵Arnd Bergmann3-1/+3
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc From Sekhar Nori: DaVinci SoC changes for v3.11 This pull request moves DaVinci EDMA library to arch/arm/common so it can be used by OMAP based AM335x. This is a temporary step until all drivers are converted to use the dmaengine driver in drivers/dma/edma.c. Several drivers like SPI, MMC/SD have already been converted. Some like audio are pending. The other two patches in the pull request are cleanup in nature. * tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: edma: remove unused transfer controller handlers ARM: davinci: move private EDMA API to arm/common ARM: davinci: remove __init atrribute from function declaration Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-06-20ALSA: hda - Make Thinkpad X220-tablet use generic parserDavid Henningsson1-1/+1
Like the X220, this quirk was added to support docking station, so enable the fixup instead. According to Jan, the generic parser works equal or better than the current parser. This was tested under a 3.9 kernel. Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com> Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-19ASoC: 88pm860x: Use SND_SOC_DAPM_PGA_E() instead of open-coding itLars-Peter Clausen1-4/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm_adsp: Use SND_SOC_DAPM_PGA_E() instead of open-coding itLars-Peter Clausen1-6/+4
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm_hubs: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-4/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8995: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-5/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8994: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-8/+4
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8991: Use SOC_SINGLE_EXT_TLV() instead of open-coding itLars-Peter Clausen1-7/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8990: Use SOC_SINGLE_EXT_TLV() instead of open-coding itLars-Peter Clausen1-8/+3
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8904: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-7/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8903: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-4/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: wm8400: Use SOC_SINGLE_EXT_TLV() instead of open-coding itLars-Peter Clausen1-7/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ASoC: tlv320aix3x: Use SOC_SINGLE_EXT() instead of open-coding itLars-Peter Clausen1-4/+2
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-19ALSA: hda - Fix missing Mic Boost controls for VIA codecsTakashi Iwai2-0/+10
Some VIA codecs like VT1708S have Mic boost amps in the mic pins but they aren't exposed in the capability bits. In the past driver code, we override the pin caps and create mic boost controls forcibly. While transition to the generic parser, we lost the mic boost controls although the pin caps are still overridden, because the generic parser code checks the widget caps, too. So this patch adds a new helper function to allow the override of the given widget capability bits, and makes VIA codecs driver to add the missing input-amp capability bit. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=59861 Cc: <stable@vger.kernel.org> [v3.9+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: hda - Use snd_hda_check_power_state() in patch_hdmi.cTakashi Iwai1-6/+2
... instead of open codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: hda - Avoid choose same converter for unused pinsWang Xingchao1-14/+75
For Intel Haswell HDMI codecs, the pins choose converter 0 by default. This would cause conflict when playing audio on unused pins,the pin with physical device connected would get audio data too. i.e. Pin 0/1/2 default choose converter 0, pin 1 has HDMI monitor connected. when play audio on Pin 0 or pin 2, pin 1 could get audio data too. This patch configure unused pins to choose different converter. Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: hda - Cache the MUX selection for generic HDMITakashi Iwai1-1/+1
When a selection to a converter MUX is changed in hdmi_pcm_open(), it should be cached so that the given connection can be restored properly at PM resume. We need just to replace the corresponding snd_hda_codec_write() call with snd_hda_codec_write_cache(). Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: firewire: fix error return code in scs_probe()Wei Yongjun1-1/+3
Fix to return -ENOMEM in the kmalloc() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: hda - Haswell converter power state D0 verifyWang Xingchao1-2/+11
Haswell converters maybe in wrong power state before usage. i.e. only converter 0 is in D0, converter 1/2 are in D3. When pin choose converter 1/2, there's no audio output, this cause dependency when playing differnt stream on pins. AUD_PWRST ConvertorA_Widget_Power_State_Current D0 AUD_PWRST ConvertorA_Widget_Power_State_Requsted D0 AUD_PWRST ConvertorB_Widget_Power_State_Current D3 AUD_PWRST ConvertorB_Widget_Power_State_Requested D3 AUD_PWRST ConvC_Widget_PwrSt_Curr D3 AUD_PWRST ConvC_Widget_PwrSt_Req D3 This patch check converter's power state and set D0 if it's in D3 mode. Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: hda - Fix return value of snd_hda_check_power_state()Takashi Iwai1-1/+1
The refactoring by commit 9040d102 introduced the new function snd_hda_check_power_state(). This function is supposed to return true if the state already reached to the target state, but it actually returns false for that. An utterly stupid typo while copy & paste. Fortunately this didn't influence on much behavior because powering up AFG usually powers up the child widgets, too. But the finer power control must have been broken by this bug. Cc: <stable@vger.kernel.org> [v3.9+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ALSA: sound/usb/misc/ua101.c: convert __list_for_each usage to list_for_eachDave Jones1-1/+1
Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-06-18ARM: davinci: move private EDMA API to arm/commonMatt Porter3-1/+3
Move mach-davinci/dma.c to common/edma.c so it can be used by OMAP (specifically AM33xx) as well. Signed-off-by: Matt Porter <mporter@ti.com> Acked-by: Chris Ball <cjb@laptop.org> # davinci_mmc.c Acked-by: Mark Brown <broonie@linaro.org> Acked-by: Olof Johansson <olof@lixom.net> [nsekhar@ti.com: dropped davinci sffsdr changes] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
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