Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: ASoC: Pass the DAI being configured into CPU DAI probe and remove

Browse source 
This allows per-DAI initialisation to be done by the CPU DAI drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Mark Brown 2008-06-11 13:47:10 +01:00 committed by Jaroslav Kysela
parent dbac7cb8a7
commit bdb92876f0
7 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/sound/soc.h
View file

@ -358,8 +358,10 @@ struct snd_soc_cpu_dai {
unsigned char type;
/* DAI callbacks */
int (*probe)(struct platform_device *pdev);
void (*remove)(struct platform_device *pdev);
int (*probe)(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai);
void (*remove)(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai);
int (*suspend)(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai);
int (*resume)(struct platform_device *pdev,

6
sound/soc/davinci/davinci-i2s.c
View file

@ -295,7 +295,8 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
return ret;
}
static int davinci_i2s_probe(struct platform_device *pdev)
static int davinci_i2s_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_machine *machine = socdev->machine;
@ -356,7 +357,8 @@ static int davinci_i2s_probe(struct platform_device *pdev)
return ret;
}
static void davinci_i2s_remove(struct platform_device *pdev)
static void davinci_i2s_remove(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_machine *machine = socdev->machine;

3
sound/soc/pxa/pxa2xx-ac97.c
View file

@ -310,7 +310,8 @@ static int pxa2xx_ac97_resume(struct platform_device *pdev,
#define pxa2xx_ac97_resume NULL
#endif
static int pxa2xx_ac97_probe(struct platform_device *pdev)
static int pxa2xx_ac97_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
int ret;

3
sound/soc/s3c24xx/s3c2412-i2s.c
View file

@ -601,7 +601,8 @@ struct clk *s3c2412_get_iisclk(void)
EXPORT_SYMBOL_GPL(s3c2412_get_iisclk);
static int s3c2412_i2s_probe(struct platform_device *pdev)
static int s3c2412_i2s_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
DBG("Entered %s\n", __func__);

6
sound/soc/s3c24xx/s3c2443-ac97.c
View file

@ -209,7 +209,8 @@ static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = {
.dma_size = 4,
};
static int s3c2443_ac97_probe(struct platform_device *pdev)
static int s3c2443_ac97_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
int ret;
u32 ac_glbctrl;
@ -260,7 +261,8 @@ static int s3c2443_ac97_probe(struct platform_device *pdev)
return ret;
}
static void s3c2443_ac97_remove(struct platform_device *pdev)
static void s3c2443_ac97_remove(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
free_irq(IRQ_S3C244x_AC97, NULL);
clk_disable(s3c24xx_ac97.ac97_clk);

3
sound/soc/s3c24xx/s3c24xx-i2s.c
View file

@ -377,7 +377,8 @@ u32 s3c24xx_i2s_get_clockrate(void)
}
EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate);
static int s3c24xx_i2s_probe(struct platform_device *pdev)
static int s3c24xx_i2s_probe(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai)
{
DBG("Entered %s\n", __func__);

6
sound/soc/soc-core.c
View file

@ -768,7 +768,7 @@ static int soc_probe(struct platform_device *pdev)
for (i = 0; i < machine->num_links; i++) {
struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;
if (cpu_dai->probe) {
ret = cpu_dai->probe(pdev);
ret = cpu_dai->probe(pdev, cpu_dai);
if (ret < 0)
goto cpu_dai_err;
}
@ -798,7 +798,7 @@ static int soc_probe(struct platform_device *pdev)
for (i--; i >= 0; i--) {
struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;
if (cpu_dai->remove)
cpu_dai->remove(pdev);
cpu_dai->remove(pdev, cpu_dai);
}
if (machine->remove)
@ -827,7 +827,7 @@ static int soc_remove(struct platform_device *pdev)
for (i = 0; i < machine->num_links; i++) {
struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;
if (cpu_dai->remove)
cpu_dai->remove(pdev);
cpu_dai->remove(pdev, cpu_dai);
}
if (machine->remove)