summaryrefslogtreecommitdiffstats
path: root/sound
AgeCommit message (Collapse)Author
2013-04-12Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/ux500' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-nextMark Brown
2013-04-12Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown
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>