diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-05 11:18:52 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:58 +0200 |
| commit | d3f7f65607b1201adad8a2edd5d9e5e95eb01d25 (patch) | |
| tree | 0f971d59ed7f995c1bd0596d3abeb9531e2a4bc2 /sound/soc/codecs/cg29xx.c | |
| parent | f930610c093e13965ec70493634e5fa543e0f16d (diff) | |
Ux500 ASoC: Adaptations in the AB8500-parts for U8500.
Support added for more channels and more formats and configuration
possibilities.
Added controls in AB8500-codec for fsbitclk and master generator.
Change-Id: I2ea60c54c3892340b4a0d1771a1efdb504cc2495
Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18279
Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-mop500.c
Diffstat (limited to 'sound/soc/codecs/cg29xx.c')
| -rw-r--r-- | sound/soc/codecs/cg29xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c index 56b23be8e97..272f8f9287b 100644 --- a/sound/soc/codecs/cg29xx.c +++ b/sound/soc/codecs/cg29xx.c @@ -651,7 +651,7 @@ struct snd_soc_codec_driver cg29xx_codec_drv = { .write = cg29xx_codec_write, }; -static __devinit int cg29xx_codec_drv_probe(struct platform_device *pdev) +static int cg29xx_codec_drv_probe(struct platform_device *pdev) { int ret; struct cg29xx_codec_dai_data *dai_data; @@ -714,7 +714,7 @@ static __devinit int cg29xx_codec_drv_probe(struct platform_device *pdev) return 0; } -static int __devexit cg29xx_codec_drv_remove(struct platform_device *pdev) +static int cg29xx_codec_drv_remove(struct platform_device *pdev) { (void)cg2900_audio_close(&codec_private.session); @@ -741,7 +741,7 @@ static struct platform_driver cg29xx_codec_platform_drv = { .owner = THIS_MODULE, }, .probe = cg29xx_codec_drv_probe, - .remove = __devexit_p(cg29xx_codec_drv_remove), + .remove = cg29xx_codec_drv_remove, .suspend = cg29xx_codec_drv_suspend, .resume = cg29xx_codec_drv_resume, }; |