- 30 Nov, 2010 3 commits
-
-
Daniel Glöckner authored
s6000_soc_platform has lost its forward declaration and there no longer is a name element in it, so use a string constant when calling request_irq. Signed-off-by:
Daniel Glöckner <daniel-gl@gmx.net> Acked-by:
Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
Daniel Glöckner authored
A semicolon was missing. Signed-off-by:
-
Axel Lin authored
In nuc900_dma_hw_params(), if snd_pcm_lib_malloc_pages failed it returns without calling spin_unlock_irqrestore(). Since snd_pcm_lib_malloc_pages() does not touch struct nuc900_audio, we don't need to hold the lock while calling snd_pcm_lib_malloc_pages(). Fix it by moving spin_lock_irqsave() down to after snd_pcm_lib_malloc_pages(). In nuc900_dma_prepare(), spin_unlock_irqrestore() is missing in the error path. Fix it by removing the return in default case. Signed-off-by:
Axel Lin <axel.lin@gmail.com> Acked-by:
Wan ZongShun <mcuos.com@gmail.com> Acked-by:
-
- 29 Nov, 2010 6 commits
-
-
Axel Lin authored
Otherwise, calling dev_get_drvdata in p1022_ds_remove returns NULL. Signed-off-by:
Timur Tabi <timur@freescale.com> Acked-by:
-
Axel Lin authored
Otherwise, calling dev_get_drvdata in mpc8610_hpcd_remove returns NULL. Signed-off-by:
-
Axel Lin authored
I think this unneededd !! operations just reduce the readability. Signed-off-by:
-
Axel Lin authored
This patch fixes below error: CC sound/soc/nuc900/nuc900-pcm.o sound/soc/nuc900/nuc900-pcm.c: In function 'nuc900_dma_open': sound/soc/nuc900/nuc900-pcm.c:267: error: 'nuc900_ac97_data' undeclared (first use in this function) sound/soc/nuc900/nuc900-pcm.c:267: error: (Each undeclared identifier is reported only once sound/soc/nuc900/nuc900-pcm.c:267: error: for each function it appears in.) sound/soc/nuc900/nuc900-pcm.c: At top level: sound/soc/nuc900/nuc900-pcm.c:337: error: expected ',' or ';' before 'static' sound/soc/nuc900/nuc900-pcm.c:354: error: 'nuc900_soc_platform_probe' undeclared here (not in a function) make[3]: *** [sound/soc/nuc900/nuc900-pcm.o] Error 1 make[2]: *** [sound/soc/nuc900] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 Signed-off-by:
-
Axel Lin authored
This patch fixes below compile warning: CC sound/soc/nuc900/nuc900-ac97.o sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type Signed-off-by:
-
Axel Lin authored
Fix below compile error by add a missing ';'. CC sound/soc/nuc900/nuc900-ac97.o sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type sound/soc/nuc900/nuc900-ac97.c:318: error: expected ',' or ';' before 'static' sound/soc/nuc900/nuc900-ac97.c:405: error: 'nuc900_ac97_drvprobe' undeclared here (not in a function) make[3]: *** [sound/soc/nuc900/nuc900-ac97.o] Error 1 make[2]: *** [sound/soc/nuc900] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 Signed-off-by:
-
- 25 Nov, 2010 12 commits
-
-
Axel Lin authored
In current implementation, there are resources leak in the error path. This patch properly reclaims the allocated resources in the error path. Also adds a missing clk_put in osk_soc_exit. Signed-off-by:
Jarkko Nikula <jhnikula@gmail.com> Acked-by:
-
Axel Lin authored
If aic3x_read failed , val is used uninitialized. Fix it by initializing val to 0. This patch fixes below compile warning: sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_get_gpio': sound/soc/codecs/tlv320aic3x.c:1183: warning: 'val' may be used uninitialized in this function sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_headset_detected': sound/soc/codecs/tlv320aic3x.c:1211: warning: 'val' may be used uninitialized in this function sound/soc/codecs/tlv320aic3x.c: In function 'aic3x_button_pressed': sound/soc/codecs/tlv320aic3x.c:1219: warning: 'val' may be used uninitialized in this function Signed-off-by:
-
Axel Lin authored
Signed-off-by:
-
Axel Lin authored
Fix imx_phycore_init() error path and imx_phycore_exit() to properly free allocated resources. Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de> Acked-by:
-
Axel Lin authored
Fix imx_ssi_probe() error path and imx_ssi_remove() to properly free allocated resources. Signed-off-by:
-
Axel Lin authored
Fix the error path to properly free allocated resources. Signed-off-by:
Mika Westerberg <mika.westerberg@iki.fi> Acked-by:
-
Axel Lin authored
Fix the error path to properly free allocated resources. Signed-off-by:
-
Axel Lin authored
Signed-off-by:
-
Axel Lin authored
Add missing platform_device_put() if platform_device_add() failed. Signed-off-by:
-
Axel Lin authored
Add missing platform_device_put() if platform_device_add() failed. Signed-off-by:
-
Axel Lin authored
We call snd_soc_register_dais() in sh4_soc_dai_probe(), thus we should call snd_soc_unregister_dais() in sh4_soc_dai_remove(). Otherwise, we got "too many arguments to function 'snd_soc_unregister_dai'" error message. Signed-off-by:
-
Dmitry Artamonow authored
Fix following warning observed when SND_PXA2XX_SOC is set and SND_ARM isn't: warning: (SND_PXA2XX_AC97 && SOUND && !M68K && SND && SND_ARM && ARCH_PXA || SND_PXA2XX_SOC && SOUND && !M68K && SND && SND_SOC && ARCH_PXA) selects SND_PXA2XX_LIB which has unmet direct dependencies (SOUND && !M68K && SND && SND_ARM) Signed-off-by:
Dmitry Artamonow <mad_soft@inbox.ru> Acked-by:
-
- 24 Nov, 2010 5 commits
-
-
Axel Lin authored
Signed-off-by:
-
Mark Brown authored
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.37
-
Axel Lin authored
Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed. Signed-off-by:
-
Axel Lin authored
MCLKDIV bit of Register 04h Clocking1: 0 : Divide by 1 1 : Divide by 2 Thus in the case of freq <= 16500000, we should clear MCLKDIV bit. Signed-off-by:
-
Axel Lin authored
DACSLOPE bit of Register 06h ADC and DAC Control 2: 0: Normal mode 1: Sloping stop-band mode Thus in the case of normal mode, we should clear DACSLOPE bit. Signed-off-by:
-
- 23 Nov, 2010 6 commits
-
-
Axel Lin authored
Signed-off-by:
-
Axel Lin authored
Signed-off-by:
-
Axel Lin authored
Signed-off-by:
-
Axel Lin authored
Signed-off-by:
Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by:
-
Jesper Juhl authored
Eliminate duplicate #include <linux/of_device.h> from sound/soc/fsl/mpc5200_dma.c Signed-off-by:
Jesper Juhl <jj@chaosbits.net> Acked-by:
-
Takashi Iwai authored
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
-
- 22 Nov, 2010 5 commits
-
-
Mark Brown authored
They went AWOL during the multi-component merge. Signed-off-by:
-
Mark Brown authored
Signed-off-by:
-
Vasiliy Kulikov authored
After clk_get() mclk is checked second time instead of pllb check. In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument. Signed-off-by:
Vasiliy Kulikov <segoon@openwall.com> Acked-by:
-
Axel Lin authored
Looks like this is missing during multi-component conversion. Signed-off-by:
-
Vasiliy Kulikov authored
After clk_get() mclk is checked three times instead of mout_epll and sclk_spdif checks. Signed-off-by:
-
- 19 Nov, 2010 1 commit
-
-
Axel Lin authored
After checking the code in 2.6.36, I found this is missing during multi-component conversion. Signed-off-by:
-
- 18 Nov, 2010 1 commit
-
-
Jesse Marroquin authored
This patch adds initial support for the MAX98089 CODEC. Signed-off-by:
Jesse Marroquin <jesse.marroquin@maxim-ic.com> Acked-by:
-
- 17 Nov, 2010 1 commit
-
-
Chris Paulson-Ellis authored
Multi-component commit f0fba2ad broke a few things which this patch should fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be good if those with access to other Davinci boards could test. -- The multi-component commit put the initialisation of snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c). The initialisation had to be moved from the probe function in these drivers because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver. Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in davinci-pcm.c) before hw_params is called. I have moved the initialisation to a new snd_soc_dai_ops.startup function in each of these drivers. This fix indicates that all platforms that use davinci-pcm must have been broken and need to test with this fix. -- The multi-component commit also changed the McBSP driver name from "davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board level references to the driver name. This change is understandable, as there is a similarly named "davinci-mcasp" driver in davinci-mcasp.c. There is probably no 'correct' name for this driver. The DM6446 datasheet calls it the "ASP" and describes it as a "specialised McBSP". The DM355 datasheet calls it the "ASP" and describes it as a "specialised ASP". The DM365 datasheet calls it the "McBSP". Rather than fix this problem by reverting to "davinci-asp", I've elected to avoid future confusion with the "davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also consistent with the names of the functions in the driver. There are other fixes required, so it was never going to be as simple as a revert anyway. -- The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has 2 ports), so I've changed the the id of the platform_device from 0 to -1. -- In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link structure with the DM355 EVM as they use different cpu DAI names (the DM355 has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port). This also means that the 2 boards need different snd_soc_card structures. -- The codec_name entries in davinci-evm.c didn't match the i2c ids in the board files. I have only checked and fixed the details of the names used for the McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should check the others. Signed-off-by:
Chris Paulson-Ellis <chris@edesix.com> Acked-by:
-
