- 23 Nov, 2010 8 commits
-
-
Jassi Brar authored
Remove S3C,s3c from static defines. s3c_dma_ -> dma_ s3c24xx_runtime_ -> runtime_ s3c24xx_audio_ -> audio_ s3c_preallocate_ -> preallocate_ s3c24xx_soc_platform -> samsung_asoc_platform s3c24xx_pcm_driver -> asoc_dma_driver snd_s3c24xx_pcm_ -> samsung_asoc_ Signed-off-by:
Jassi Brar <jassi.brar@samsung.com> Acked-by:
Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
Jassi Brar authored
Rename Samsung PCM Controller driver s3c-pcm.[c/h] -> pcm.[c/h] Signed-off-by:
-
Jassi Brar authored
Rename Samsung AC97 driver s3c-ac97.[c/h] -> ac97.[c/h] Signed-off-by:
-
Jassi Brar authored
Call the AC97 controller devices found in S3C, S5P and newer SoCs as 'samsung-ac97' rather than 's3c-ac97'. Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com> Acked-by:
-
Jassi Brar authored
Rename Samsung ASoC DMA driver s3c-dma.[c/h] -> dma.[c/h] Signed-off-by:
-
Jassi Brar authored
The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms. Signed-off-by:
-
Jassi Brar authored
Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :- s3c24xx-pcm-audio -> samsung-audio Signed-off-by:
-
Jassi Brar authored
AQUILA and GONI are essentially the same h/w w.r.t ASoC. They only differ by the fact that GONI has stereo speaker-out whereas AQUILA has mono. The difference can easily be handled in the same MACHINE driver by making machine-specific runtime changes. Signed-off-by:
-
- 22 Nov, 2010 11 commits
-
-
Mark Brown authored
-
Axel Lin authored
Signed-off-by:
Axel Lin <axel.lin@gmail.com> Acked-by:
-
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:
-
Jarkko Nikula authored
There is no need anymore to include soc.h in soc-dapm.h and soc-dai.h as drivers are converted to include only soc.h. Thanks to Lars-Peter Clausen <lars@metafoo.de> for pointing out the issue. Signed-off-by:
Jarkko Nikula <jhnikula@gmail.com> Acked-by:
-
Jarkko Nikula authored
There is no need to include soc-dai.h since soc.h includes it. Convert drivers to include only soc.h. Signed-off-by:
-
Jarkko Nikula authored
There is no need to include soc-dapm.h since soc.h includes it. Signed-off-by:
-
Jarkko Nikula authored
Commit ce6120cc require that soc-dapm.h cannot be included before soc.h but these two drivers were not checked. Fix them by including only soc.h as it includes soc-dapm.h. Signed-off-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 5 commits
-
-
Mark Brown authored
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
-
Mark Brown authored
-
Mark Brown authored
Makes the WM8994 driver file itself substantially smaller. Signed-off-by:
-
Axel Lin authored
After checking the code in 2.6.36, I found this is missing during multi-component conversion. Signed-off-by:
-
Mark Brown authored
Allow the application to choose if the ADC data presented on the left and right channels is sourced from the internal left or right channel. This allows a mono recording to be presented as stereo on the external bus. Signed-off-by:
-
- 18 Nov, 2010 10 commits
-
-
Jassi Brar authored
Define platform devices for all audio devices found on S5PV310 Signed-off-by:
-
Jassi Brar authored
Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by:
-
Jassi Brar authored
Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by:
-
Jassi Brar authored
Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by:
-
Jassi Brar authored
Add more information to I2S platform_devices in order to prepare them for new controller driver. Also, discard duplicated gpio-cfg. Signed-off-by:
-
Jassi Brar authored
Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by:
-
Jassi Brar authored
Add new defined and data structures in order to prepare for new I2S driver. Signed-off-by:
-
Jassi Brar authored
Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s' Signed-off-by:
-
Jassi Brar authored
Samsung's Soc S5PV310 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PV310 platform. Signed-off-by:
-
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 3 commits
-
-
Mark Brown authored
-
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:
-
Mark Brown authored
During the multi-component conversion the WM8994 register cache init got lost. Signed-off-by:
-
- 16 Nov, 2010 3 commits
-
-
Mark Brown authored
DAPM widgets may be associated with non-CODEC devices so compare based on the DAPM context rather than the CODEC pointer. Signed-off-by:
-
Axel Lin authored
We allocated memory for wm8962 in wm8962_i2c_probe, and will free the memory in either wm8962_i2c_probe error path or wm8962_i2c_remove. Thus we should not call kfree(wm8962) in wm8962_probe, otherwise we have double free of wm8962. Signed-off-by:
-
Axel Lin authored
We allocated memory for wm8731 in wm8731_spi_probe / wm8731_i2c_probe, and will free the memory in either wm8731_spi_probe / wm8731_i2c_probe error path or wm8731_spi_remove / wm8731_i2c_remove. Thus we should not call kfree(wm8731) in wm8731_probe, otherwise we have double free of wm8731. Signed-off-by:
-
