Commit bdb92876 authored by Mark Brown's avatar Mark Brown Committed by Jaroslav Kysela
Browse files

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



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

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent dbac7cb8

include/sound/soc.h

+4 −2
Original line number Diff line number Diff line
@@ -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,

sound/soc/davinci/davinci-i2s.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/pxa/pxa2xx-ac97.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/s3c24xx/s3c2412-i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -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__);

sound/soc/s3c24xx/s3c2443-ac97.c

+4 −2
Original line number Diff line number Diff line
@@ -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);