summaryrefslogtreecommitdiffstats
path: root/sound
AgeCommit message (Collapse)Author
2013-04-12Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/fix/wm8903' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/fix/tegra' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/fix/samsung' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/fix/core' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/fix/compress' into asoc-nextMark Brown
2013-04-12ASoC: samsung: fix neo1973-wm8753 compilationHeiko Stübner
Commit b2ca78717cea (ARM: S3C24XX: make gta02.h local) already replaced the GTA02_GPIO_* constants in neo1973-wm8753.c but forgot to remove the inclusion of mach/gta02.h before moving the file out of mach/. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-12Merge tag 'asoc-v3.9-rc6' of ↵Takashi Iwai
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Updates for v3.9 A few updates, more than I'd like, fixing some relatively small issues but mostly driver specific ones. Nothing wildly exciting so if it doesn't make v3.9 it won't be the end of the world but it'd be nice.
2013-04-11ASoC: samsung: move plat/ headers to local directoryArnd Bergmann
The plat/regs-iis.h and plat/regs-ac97.h files in the samsung platform are only needed by the ASoC drivers, so they can be moved into the same directory, as one more step towards a multiplatform build. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11ASoC: wm_adsp: Add support for firmware wide coefficient blocksMark Brown
Firmwares may provide some firmware wide configuration regions which can be configured by the coefficient files using the firmware ID as the algorithm ID, include these in the algorithm list. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11Merge remote-tracking branch 'asoc/fix/wm8903' into tmpMark Brown
2013-04-11Merge remote-tracking branch 'asoc/fix/tegra' into tmpMark Brown
2013-04-11Merge remote-tracking branch 'asoc/fix/samsung' into tmpMark Brown
2013-04-11Merge remote-tracking branch 'asoc/fix/core' into tmpMark Brown
2013-04-11Merge remote-tracking branch 'asoc/fix/compress' into tmpMark Brown
2013-04-11ASoC: samsung: export idma_reg_addr_initArnd Bergmann
The idma_reg_addr_init function is used by the samsung i2s driver, which can be a loadable module, so we have to export this function. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11ASoC: samsung: fix module_device_tableArnd Bergmann
The second argument to the module_device_table macro must be the name of the device id array. In the samsung i2s driver, there was a small typo, resulting in a build error when building it as a loadable module. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11ASoC: samsung: use irq resource for idmaArnd Bergmann
With multiplatform kernels, we cannot use hardwired IRQ numbers in device drivers. This changes the idma driver to use a proper resource, like all other drivers do. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11ALSA: hda - Handle Headphone Mic jack more genericDavid Henningsson
Now that we have a flag for headphone mics, we can use that flag in the jack creation instead of creating the jack manually. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-11ALSA: hda - add some small convenience functions to auto parserDavid Henningsson
I never liked that we move our speaker and hp pins to line out if there are not any line outs; but now that we do, add some convenience functions to find hp and speaker pins even if they have been moved. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-11ALSA: hda - allow "Headphone Mic" parser flagDavid Henningsson
This allows a specific mic to get the "Headphone Mic" name, in addition to the existing "Headset Mic" name. Also, it allows for a special mark: if the sequence number is set to 0xc, that's an indication to prefer it for headset mic, and if it's set to 0xd, that's an indication to prefer it for headphone mic. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-11ALSA: at73c213: Use dev_pm_opsLars-Peter Clausen
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-10ALSA: snd-usb: Playback Design: use usb_set_inferface quirk from more locationsDaniel Mack
It turns out the devices from Playback Design need the delay quirk after usb_set_interface from clocks.c as well. Make it a proper quirks function and factor out the code to quirks.c. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-09ASoC: wm5102: Correct lookup of arizona struct in SYSCLK eventMark Brown
Reported-by: Ryo Tsutsui <Ryo.Tsutsui@wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
2013-04-09ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is runningAlban Bedel
The Charge Pump needs the DSP clock to work properly, without it the bypass to HP/LINEOUT is not working properly. This requirement is not mentioned in the datasheet but has been confirmed by Mark Brown from Wolfson. Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
2013-04-09ASoC: wm8994: Remove duplicate revision cacheMark Brown
There's already a device revision stored in the core data structure, don't duplicate it in the CODEC driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-09ALSA: hda - Apply codec delay to wallclock.Dylan Reid
For playback add the codec-side delay to the timestamp, for capture subtract it. This brings the timestamps in line with the time that was recently added to the delay reporting. Signed-off-by: Dylan Reid <dgreid@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-08ASoC: Ux500: remove test for undefined Kconfig macroPaul Bolle
A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there never was a corresponding Kconfig symbol so this test has always evaluated to true. And since AB5500 support was removed in v3.5 it appears safe to remove this test and a few lines of code. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-07ASoC: ux500_pcm: Use the same snd_pcm_hardware for playback and captureLars-Peter Clausen
The snd_pcm_hardware structs for playback and capture in the ux500 PCM are identical, so remove one of them and use the same snd_pcm_hardware struct for both playback and capture. Also move the defines used to initialize the snd_pcm_hardware fields from ux500_pcm.h to ux500_pcm.c since that's the only place where they are used. Also drop the assignment of the snd_pcm_hardware struct to runtime->hw since that is what the call to snd_soc_set_runtime_hwparams() right above it already does, so the second assignment is redundant. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-07ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_*Eldad Zack
The usb_control_msg() function expects __u16 types and performs the endianness conversions by itself. However, in three places, a conversion is performed before it is handed over to usb_control_msg(), which leads to a double conversion (= no conversion): * snd_usb_nativeinstruments_boot_quirk() * snd_nativeinstruments_control_get() * snd_nativeinstruments_control_put() Caught by sparse: sound/usb/mixer_quirks.c:512:38: warning: incorrect type in argument 6 (different base types) sound/usb/mixer_quirks.c:512:38: expected unsigned short [unsigned] [usertype] index sound/usb/mixer_quirks.c:512:38: got restricted __le16 [usertype] <noident> sound/usb/mixer_quirks.c:543:35: warning: incorrect type in argument 5 (different base types) sound/usb/mixer_quirks.c:543:35: expected unsigned short [unsigned] [usertype] value sound/usb/mixer_quirks.c:543:35: got restricted __le16 [usertype] <noident> sound/usb/mixer_quirks.c:543:56: warning: incorrect type in argument 6 (different base types) sound/usb/mixer_quirks.c:543:56: expected unsigned short [unsigned] [usertype] index sound/usb/mixer_quirks.c:543:56: got restricted __le16 [usertype] <noident> sound/usb/quirks.c:502:35: warning: incorrect type in argument 5 (different base types) sound/usb/quirks.c:502:35: expected unsigned short [unsigned] [usertype] value sound/usb/quirks.c:502:35: got restricted __le16 [usertype] <noident> Signed-off-by: Eldad Zack <eldad@fogrefinery.com> Acked-by: Daniel Mack <zonque@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-04-07ALSA: hda/realtek - Add a quirk for AC700 Chromebook.Dylan Reid
Correct pin configs for the Acer AC700. Most importantly indicate that SPDIF is connected, it routes to HDMI out. Similar to Aspire models, chain in the DMIC fixup and allow it to be applied to this codec (ALC269VB) as well. Signed-off-by: Dylan Reid <dgreid@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>