aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-12ASoC: OMAP: mcbsp.h: Clean up bit definitionsPeter Ujfalusi1-97/+97
Use BIT() for bit position, correct field definition by adding mask to them, and also adding the missing spaces around '<<' Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12ARM: OMAP: Do not register omap-mcbsp-dai devicePeter Ujfalusi3-38/+0
The driver for omap-mcbsp-dai no longer exist since it has been merged with the omap-mcbsp driver. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12ASoC: omap-mcbsp: Create a single driver for McBSPPeter Ujfalusi20-449/+234
The OMAP McBSP driver stack used to contain two different drivers. One of them was used as kind low-level access to the IP, while the other driver was the ASoC DAI driver. There were global, shared structures, in different places, the McBSP instances are reffered with id numbers (sometimes 0 based, in other cases 1 based id numbers). Create one single driver for OMAP McBSP with name: omap-mcbsp. Convert the old omap-mcbsp driver initially to be a library for the omap-mcbsp DAI driver. With this change we can get rid of all global variables, structures. Further cleanup is coming... Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12ASoC: OMAP: McBSP: Consolidate plat/mcbsp.h contentPeter Ujfalusi4-273/+304
Move most of the content of the plat/mcbsp.h header file under sound/soc/omap/ to help further cleanups. Signed-off-by: Peter Ujfalusi <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12OMAP: mcbsp: Move core driver under sound/soc/omapPeter Ujfalusi5-11/+8
In order to consolidate the McBSP driver move it out from arch/arm/plat-omap directory under sound/soc/omap/ Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12ARM: OMAP: mcbsp: Convert core driver to proper platform driverPeter Ujfalusi4-8/+8
Convert the plat-omap/mcbsp.c driver to be proper platform driver. Remove the omap_mcbsp_init function call which was called from mach-omap1/2/mcbsp.c to register the platform driver for the just created platform device in the same function. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Tested-by: Janusz Krzysztofik <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12OMAP4: panda: Correct cpu version check for 4430Peter Ujfalusi1-1/+1
The cpu_is_omap4430() macro always return with 0. Use the correct cpu_is_omap443x() to check for Panda revision. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2012-03-12ALSA: Add a hook capability to vmaster controlsTakashi Iwai2-1/+50
This patch adds a hook to vmaster control to be called at each time when the master value is changed. It'd be handy for an additional mute LED control following the Master switch, for example. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-12ASoC: Revert widget I/O locking for 3.4Mark Brown1-28/+6
The widget locking depends on some of the other locking changes which are queued up for 3.5 not 3.4 so revert the locking changes and reapply them in 3.5. This reverts commit 66bf93212f19548f5ed221356b2d70189cc18254 and 96acc357bedad69fbc94d1b923a960af5a411c6f. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2012-03-09ALSA: hda - Initialize vmaster slave volumesTakashi Iwai3-7/+72
When the driver is changed to use vmaster or a new slave element is added by the improvement of the parser code, user may face often the silent output because of the muted slave mixer although Master volume is properly set. And they complain. And I get upset. Although such a mixer element should be initialized via "alsactl init", it'd be more user-friendly if the known output slaves are unmuted and set to 0dB so that user can control the volume only with Master as default. Since Master is still set muted as default even with this change, no risk of the speaker blow up, too. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-09ALSA: core - Refactor card id string creation codeTakashi Iwai1-69/+100
The code to handle the card id string is fairly messy, so here is a tidy up. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-09ASoC: da7210: Remove extra registers from defaults listAshish Chavan1-88/+0
This patch removes following registers from reg map defaults, - Registers which are currently not used by driver - Non existing registers - Volatile registers Signed-off-by: Ashish Chavan <[email protected]> Signed-off-by: David Dajun Chen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-09ASoC: fsl: check property 'compatible' for the machine nameShawn Guo3-31/+9
Check /compatible rather than /model to determine the machine name. The p1022ds older device trees get a different /model from the new ones, while /compatible is consistent there, so checking /compatible will save the bother of detecting older p1022ds device trees. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-08ASoC: wm8996: Remove separate output stage enable stepMark Brown1-20/+12
Marginally improve performance during startup. Signed-off-by: Mark Brown <[email protected]>
2012-03-08ASoC: wm8996: Remove some volatile regisers from the defaults tableMark Brown1-2/+0
Signed-off-by: Mark Brown <[email protected]>
2012-03-08ASoC: core: missing set_fmt should not be complaintShawn Guo1-5/+6
Not having a DAI link set_fmt operation is perfectly normal and should not be complaint. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-08ASoC: da7210: Update for using I2C regmapAshish Chavan1-38/+196
Current DA7210 driver has I2C support using older register cache methods. This patch updates it for latest regmap framework. This has been tested on DA7210 EVB with Samsung SMDK6410 board. Signed-off-by: Ashish Chavan <[email protected]> Signed-off-by: David Dajun Chen <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-08ASoC: add more sample rate for pxa-sspQiao Zhou1-1/+2
add more sample rate for pxa-ssp, which are supported, such as 32KHz, 64KHz. Signed-off-by: Qiao Zhou <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-08ALSA: hdspm - Provide ioctl_compatAdrian Knoth1-0/+1
snd_hdspm uses its own ioctls to acquire config- and status information. Expose the corresponding ioctl handler via ioctl_compat, so that 32bit applications can use it on 64bit kernels. Signed-off-by: Adrian Knoth <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-07ASoC: imx: imx-audmux: Fix section mismatchFabio Estevam1-4/+4
Fix the following section mismatch warning: WARNING: vmlinux.o(.data+0x35be8): Section mismatch in reference from the variable imx_audmux_driver to the function .init.text:imx_audmux_probe() The variable imx_audmux_driver references the function __init imx_audmux_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-07ASoC: dapm: Only lock CODEC for I/O if not using regmapMark Brown1-2/+2
If we do use regmap then regmap will take care of things for us. We actually already have this check at a higher level for the current users but this makes sure we do the right thing in the future too if we need to. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2012-03-07ALSA: hda - Set codec to D3 forcibly even if not usedTakashi Iwai2-13/+5
We've seen a problem with a pop-noise at suspend/resume on a HP machine with ALC269, and it turned out to be an issue that the controller going to D3 while the codec is unused. When the device is once suspended and resumed and kept unused, the driver doesn't initialize the codecs. Instead, the codec chips are set up dynamically at the first usage. Now, suppose the device going to suspend again before the codec is set up. The controller is turned off to D3 while the codec chips are untouched. This caused a pop noise because the codec chip might have been turned on implicitly by the hardware. As a workaround, the codec chip needs to be set to D3 when going to suspend no matter whether it was used or not. Also, for making it happening, the controller has to be always set up in the resume path. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-07ALSA: hda/realtek - Reuse init_hook for ALC269VB coef setupTakashi Iwai1-10/+5
Move the currently unused spec->init_hook at the beginning of the init sequence so that the recently added ALC269VB coef setup can be put there. The alc_init() is again clean without an ugly check. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-07Merge branch 'fix/hda' into topic/hdaTakashi Iwai2-2/+19
Conflicts: sound/pci/hda/patch_realtek.c
2012-03-07ALSA: hda/realtek - Apply the coef-setup only to ALC269VBKailang Yang1-0/+8
The coef setup in alc269_fill_coef() was designed only for ALC269VB model, and this has some bad effects for other ALC269 variants, such as turning off the external mic input. Apply it only to ALC269VB. Signed-off-by: Kailang Yang <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-06ASoC: DAPM: Make sure DAPM widget IO ops hold the component mutexLiam Girdwood1-6/+28
Currently not all DAPM widget IO ops are holding their component mutex (codec or platform). Make sure this is now held for DAPM widget IO operations. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: core: Add platform component mutexLiam Girdwood2-0/+2
Add mutex support for platform IO operations. e.g. can be used for platform DAPM widget IO ops. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: tegra: Remove unused variableStephen Warren1-1/+0
Fixes the following warning: sound/soc/tegra/tegra_alc5632.c: In function 'tegra_alc5632_asoc_init': sound/soc/tegra/tegra_alc5632.c:118:6: warning: unused variable 'ret' [-Wunused-variable] Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: dapm: Use dev_warn for debugfs warning messageLiam Girdwood1-1/+1
Remove printk(KERN_WARNING) and use dev_warn() instead. Signed-off-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06Merge tag 'asoc-3.4' of ↵Takashi Iwai35-449/+581
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc A few more ASoC updates, the main one is the move of the audmux driver from arch/arm into sound/soc. There's also some general driver specific tweaks and fixes.
2012-03-06ALSA: hda - Add Gigabyte GA-MA790X to the beep whitelistTakashi Iwai1-0/+1
Its BIOS suppresses the PC beep although it's implemented. Signed-off-by: Takashi Iwai <[email protected]>
2012-03-06ASoC: fsl: add dt support for imx-audmuxRichard Zhao2-0/+27
It adds device tree probe support for imx-audmux driver. Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: Add missing regmap_init_i2c in wm8804_i2c_probeAxel Lin1-0/+6
commit 891271c "ASoC: Convert wm8804 to direct regmap API usage" only converts wm8804_spi_probe to use regmap_init_spi. This patch adds missing regmap_init_i2c in wm8804_i2c_probe. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3Marton Balint1-0/+9
My CD input got lost in commit 68ef0561efe494143516df38c03a16b837b8e79c. Raymond helped me to add the necessary pin fixup to make it appear again. In fact, this is basically his patch. It fixes alsa bug #5541. Signed-off-by: Marton Balint <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-06ASoC: wm8962: Remove defaults for volatile registersMark Brown1-14/+3
Save a little RAM. Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: wm8962: Remove unneeded pm_runtime_set_active()Mark Brown1-1/+0
The default pm_runtime status is enabled which is what we want. Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: wm8994: Use audio mode for jack detection when system is activeMark Brown2-29/+49
When we are out of system sleep always use audio mode for jack detection in order to avoid potential performance issues handing off between modes. Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: add an explicit Kconfig option for imx-ssi driverShawn Guo2-2/+9
Currently ASoC:imx uses menuconfig option SND_IMX_SOC selects imx-ssi driver, and it works because all the machine driver covered by the menuconfig need to build imx-ssi driver in. However, it will not work any more if we have a imx based machine driver going into the menuconfig while working with fsl_ssi driver (sound/soc/fsl/fsl_ssi.c) rather than imx-ssi one. The patch adds an explicit Kconfig option SND_SOC_IMX_SSI for imx-ssi driver, so that it can be selected independently from the menuconfig option SND_IMX_SOC. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: separate imx-pcm bits from imx-ssi driverShawn Guo7-109/+150
Currently the imx-ssi.c[h] accommodates the imx-pcm common bits which are shared between imx-pcm-dma-mx2 and imx-pcm-fiq drivers. It assumes that imx-pcm-dma-mx2 and imx-pcm-fiq will always be used together with imx-ssi driver. However this becomes untrue when we see that driver sound/soc/fsl/fsl_ssi could possibly work with imx-pcm-dma-mx2 too. The patch moves the imx-pcm common bits from imx-ssi.c[h] into new files imx-pcm.c[h], and let imx-pcm-dma-mx2 and imx-pcm-fiq drivers build it in, so that imx-pcm-dma-mx2 can work with no dependency on imx-ssi driver. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: rename audmux prefix mxc to imxShawn Guo6-106/+106
It renames the legacy name mxc used in audmux function and macro to imx. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: move audmux driver into sound/soc/imxShawn Guo12-20/+19
As audmux becomes a platform driver and its callers are all ASoC machine drivers, there is no reason to keep it in arch folder, so move it to sound/soc/imx. One bonus point would be those ASoC machine drivers stop including mach/audmux.h, since it's been moved to sound/soc/imx/imx-audmux.h. This should be a move to the right direction in terms of single kernel image goal. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ARM: imx: convert audmux to a platform driverRichard Zhao6-35/+147
It coverts audmux to a platform driver, so that it can be moved into sound/soc/imx and adopt device tree support later. Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ARM: imx: merge audmux-v1 and audmux-v2Shawn Guo5-79/+34
It merges audmux-v1 and audmux-v2 under arch/arm/plat-mxc into one. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: move phycore audmux call into ASoC machine driverShawn Guo3-27/+25
It moves phycore audmux configuration call from board file into ASoC machine driver phycore-ac97 to ease converting audmux into a platform driver later. It moves phycore audmux configuration call from board file into ASoC machine driver phycore-ac97, so that it gets aligned with wm1133-ev1 and mx27vis-aic32x4, and more importantly it will ease the moving of audmux into sound/soc/imx as a platform driver later. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-06ASoC: imx: move eukrea audmux call into ASoC machine driverShawn Guo4-58/+36
It moves eukrea audmux configuration call from board file into ASoC machine driver eukrea-tlv320, so that it gets aligned wm1133-ev1 and mx27vis-aic32x4, and more importantly it will ease the moving of audmux into sound/soc/imx as a platform driver later. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-03-05ASoC: dapm: Show if widgets are forced in debugfsMark Brown1-2/+3
The information was not otherwise visible. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2012-03-05ALSA: hda - fix broken automute/autoswitch for RealtekDavid Henningsson1-1/+1
The recent addition of volume-knob widget in the auto-parser broke automute/autoswitch for some Realtek devices. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-05Merge tag 'asoc-3.4' of ↵Takashi Iwai1371-55784/+20857
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc This has been a very active release for ASoC, as well as the usual raft of bugfixes and driver updates there's quite a few framework enhancements. Most are either small or are laying the groundwork for user visible features (especially dynamic PCM), the most directly visible change is the dmaengine library. There's also a bunch of regmap API enhancements pulled into the tree so that either the framework or drivers can take advantage of the new features. Changes include: - Support for widgets not associated with a CODEC, an important part of the dynamic PCM framework. - A library factoring out the common code shared by dmaengine based DMA drivers contributed by Lars-Peter Clausen. This will save a lot of code and make it much easier to deploy enhancements to dmaengine. - Support for binary controls, used for providing runtime configuration of algorithm coefficients. - A new DAPM widget type for regulator supplies allowing drivers for devices that can power down unused supplies while active to do without any per-driver code. - DAPM widgets for DAIs, initially giving a speed boost for playback startup and shutdown and also the basis for CODEC<->CODEC DAI link support. - Support for specifying the number of significant bits on audio interfaces, useful for allowing applications to know how much effort to put into generating data for a larger sample format. - Conversion of the FSI driver used on some SH processors to DMAEngine. - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics WM2200.
2012-03-05ALSA: ice1724 - constrain runtime rates for locked internal ratePavel Hofman1-0/+23
The driver already defines control "Multi Track Rate Locking" which locks the card at current rate if switched to internal clock. This patch limits the runtime rates to this rate only, allowing proper reporting of the card capabilities, and e.g. automatic rate conversion by the plug plugin to the currently locked rate. Signed-off-by: Pavel Hofman <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-03-04Merge tag 'asoc-3.3' of ↵Takashi Iwai1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus A driver specific fix that wasn't noticed as the OpenMoko guys have been stuck on 2.6.39 for a very long time now and are just starting to catch up again.
Powered by cgit, Gruvboxed by Blaster4385.