- 24 Nov, 2010 1 commit
-
-
Mark Brown authored
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
-
- 23 Nov, 2010 25 commits
-
-
Mark Brown authored
-
Axel Lin authored
Signed-off-by:
Axel Lin <axel.lin@gmail.com> Acked-by:
Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
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:
-
Jassi Brar authored
Finally, move the 's3c24xx' directory to 'samsung' Signed-off-by:
Jassi Brar <jassi.brar@samsung.com> Acked-by:
-
Jassi Brar authored
Move prefixes to repesent the nature of Samsung ASoC suitably. SND_S3C24XX_SOC -> ASOC_SAMSUNG SND_S3C_SOC_PCM -> SND_SAMSUNG_PCM SND_S3C_SOC_AC97 -> SND_SAMSUNG_AC97 SND_S5P_SOC_SPDIF -> SND_SAMSUNG_SPDIF SND_S3C24XX_SOC_I2S -> SND_S3C24XX_I2S SND_S3C64XX_SOC_SMARTQ -> ASOC_SMARTQ SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580 SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713 SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994 Signed-off-by: -
Jassi Brar authored
Enable the ASoC Machine driver to run on SMDKC100 as well. Signed-off-by:
Kukjin Kim <kgene.kim@samsung.com> Acked-by:
-
Jassi Brar authored
We plan to use the same ASoC Machine driver for most of latest SMDK platforms. So rename the 64XX specific driver to generic named. Signed-off-by:
-
Jassi Brar authored
Now that we have better I2S CPU drivers and no need for the old ones, discard them. Signed-off-by:
-
Jassi Brar authored
Modify the smdk64xx_wm8580.c to use new i2s controller driver. Signed-off-by:
-
Jassi Brar authored
Modify the goni_wm8994.c to use new i2s controller driver. Signed-off-by:
-
Jassi Brar authored
Modify the smartq_wm8987.c to use new i2s controller driver. Signed-off-by:
-
Jassi Brar authored
The I2S controllers since S3C64XX are incremental revisions, with a new feature added to the last one. The programming i/f doesn't conflict between these revisions, so it is possible to have one common driver that could manage various versions of I2S (v3, 4 & 5) 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
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 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:
-
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:
-
Takashi Iwai authored
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc Conflicts: sound/soc/codecs/tpa6130a2.c
-
- 22 Nov, 2010 11 commits
-
-
Mark Brown authored
-
Axel Lin authored
Signed-off-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 3 commits
-
-
Axel Lin authored
As we allocate memory for twl4030 in twl4030_codec_probe(), twl4030_codec_remove() is a better place to free the memory. Signed-off-by:
-
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
-
