Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c4b266f authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

ALSA: asoc: core - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 



This patch series merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai in preparation for further
ASoC v2 patches.

This merger removes duplication in both DAI structures and simplifies
the API for other users.

Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent a5302181

include/sound/soc.h

+23 −48
Original line number Original line Diff line number Diff line
@@ -221,8 +221,7 @@ struct snd_soc_pcm_stream; 
struct snd_soc_ops;

struct snd_soc_ops;

struct snd_soc_dai_mode;

struct snd_soc_dai_mode;

struct snd_soc_pcm_runtime;

struct snd_soc_pcm_runtime;

struct snd_soc_codec_dai;

struct snd_soc_dai;

struct snd_soc_cpu_dai;

struct snd_soc_codec;

struct snd_soc_codec;

struct snd_soc_machine_config;

struct snd_soc_machine_config;

struct soc_enum;

struct soc_enum;
@@ -317,50 +316,24 @@ struct snd_soc_ops { 
/* ASoC DAI ops */

/* ASoC DAI ops */

struct snd_soc_dai_ops {

struct snd_soc_dai_ops {

	/* DAI clocking configuration */

	/* DAI clocking configuration */

	int (*set_sysclk)(struct snd_soc_codec_dai *codec_dai,

	int (*set_sysclk)(struct snd_soc_dai *dai,

		int clk_id, unsigned int freq, int dir);

		int clk_id, unsigned int freq, int dir);

	int (*set_pll)(struct snd_soc_codec_dai *codec_dai,

	int (*set_pll)(struct snd_soc_dai *dai,

		int pll_id, unsigned int freq_in, unsigned int freq_out);

		int pll_id, unsigned int freq_in, unsigned int freq_out);

	int (*set_clkdiv)(struct snd_soc_codec_dai *codec_dai,

	int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);

		int div_id, int div);





	/* DAI format configuration */

	/* DAI format configuration */

	int (*set_fmt)(struct snd_soc_codec_dai *codec_dai,

	int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);

		unsigned int fmt);

	int (*set_tdm_slot)(struct snd_soc_dai *dai,

	int (*set_tdm_slot)(struct snd_soc_codec_dai *codec_dai,

		unsigned int mask, int slots);

		unsigned int mask, int slots);

	int (*set_tristate)(struct snd_soc_codec_dai *, int tristate);

	int (*set_tristate)(struct snd_soc_dai *dai, int tristate);





	/* digital mute */

	/* digital mute */

	int (*digital_mute)(struct snd_soc_codec_dai *, int mute);

	int (*digital_mute)(struct snd_soc_dai *dai, int mute);

};

};





/* SoC Codec DAI */

/* SoC  DAI (Digital Audio Interface) */

struct snd_soc_codec_dai {

struct snd_soc_dai {

	char *name;

	int id;

	unsigned char type;



	/* DAI capabilities */

	struct snd_soc_pcm_stream playback;

	struct snd_soc_pcm_stream capture;



	/* DAI runtime info */

	struct snd_soc_codec *codec;

	unsigned int active;

	unsigned char pop_wait:1;



	/* ops */

	struct snd_soc_ops ops;

	struct snd_soc_dai_ops dai_ops;



	/* DAI private data */

	void *private_data;

};



/* SoC CPU DAI */

struct snd_soc_cpu_dai {



	/* DAI description */

	/* DAI description */

	char *name;

	char *name;

	unsigned int id;

	unsigned int id;
@@ -368,13 +341,13 @@ struct snd_soc_cpu_dai { 




	/* DAI callbacks */

	/* DAI callbacks */

	int (*probe)(struct platform_device *pdev,

	int (*probe)(struct platform_device *pdev,

		     struct snd_soc_cpu_dai *dai);

		     struct snd_soc_dai *dai);

	void (*remove)(struct platform_device *pdev,

	void (*remove)(struct platform_device *pdev,

		       struct snd_soc_cpu_dai *dai);

		       struct snd_soc_dai *dai);

	int (*suspend)(struct platform_device *pdev,

	int (*suspend)(struct platform_device *pdev,

		struct snd_soc_cpu_dai *cpu_dai);

		struct snd_soc_dai *dai);

	int (*resume)(struct platform_device *pdev,

	int (*resume)(struct platform_device *pdev,

		struct snd_soc_cpu_dai *cpu_dai);

		struct snd_soc_dai *dai);





	/* ops */

	/* ops */

	struct snd_soc_ops ops;

	struct snd_soc_ops ops;
@@ -386,7 +359,9 @@ struct snd_soc_cpu_dai { 




	/* DAI runtime info */

	/* DAI runtime info */

	struct snd_pcm_runtime *runtime;

	struct snd_pcm_runtime *runtime;

	unsigned char active:1;

	struct snd_soc_codec *codec;

	unsigned int active;

	unsigned char pop_wait:1;

	void *dma_data;

	void *dma_data;





	/* DAI private data */

	/* DAI private data */
@@ -428,7 +403,7 @@ struct snd_soc_codec { 
	struct delayed_work delayed_work;

	struct delayed_work delayed_work;





	/* codec DAI's */

	/* codec DAI's */

	struct snd_soc_codec_dai *dai;

	struct snd_soc_dai *dai;

	unsigned int num_dai;

	unsigned int num_dai;

};

};
@@ -447,12 +422,12 @@ struct snd_soc_platform { 
	int (*probe)(struct platform_device *pdev);

	int (*probe)(struct platform_device *pdev);

	int (*remove)(struct platform_device *pdev);

	int (*remove)(struct platform_device *pdev);

	int (*suspend)(struct platform_device *pdev,

	int (*suspend)(struct platform_device *pdev,

		struct snd_soc_cpu_dai *cpu_dai);

		struct snd_soc_dai *dai);

	int (*resume)(struct platform_device *pdev,

	int (*resume)(struct platform_device *pdev,

		struct snd_soc_cpu_dai *cpu_dai);

		struct snd_soc_dai *dai);





	/* pcm creation and destruction */

	/* pcm creation and destruction */

	int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *,

	int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,

		struct snd_pcm *);

		struct snd_pcm *);

	void (*pcm_free)(struct snd_pcm *);

	void (*pcm_free)(struct snd_pcm *);
@@ -466,8 +441,8 @@ struct snd_soc_dai_link { 
	char *stream_name;		/* Stream name */

	char *stream_name;		/* Stream name */





	/* DAI */

	/* DAI */

	struct snd_soc_codec_dai *codec_dai;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_cpu_dai *cpu_dai;

	struct snd_soc_dai *cpu_dai;





	/* machine stream operations */

	/* machine stream operations */

	struct snd_soc_ops *ops;

	struct snd_soc_ops *ops;

sound/soc/soc-core.c

+25 −25
Original line number Original line Diff line number Diff line
@@ -134,8 +134,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	int ret = 0;

	int ret = 0;





	mutex_lock(&pcm_mutex);

	mutex_lock(&pcm_mutex);
@@ -272,7 +272,7 @@ static void close_delayed_work(struct work_struct *work) 
	struct snd_soc_device *socdev =

	struct snd_soc_device *socdev =

		container_of(work, struct snd_soc_device, delayed_work.work);

		container_of(work, struct snd_soc_device, delayed_work.work);

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec_dai *codec_dai;

	struct snd_soc_dai *codec_dai;

	int i;

	int i;





	mutex_lock(&pcm_mutex);

	mutex_lock(&pcm_mutex);
@@ -323,8 +323,8 @@ static int soc_codec_close(struct snd_pcm_substream *substream) 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;





	mutex_lock(&pcm_mutex);

	mutex_lock(&pcm_mutex);
@@ -384,8 +384,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;

	int ret = 0;

	int ret = 0;
@@ -489,8 +489,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	int ret = 0;

	int ret = 0;





	mutex_lock(&pcm_mutex);

	mutex_lock(&pcm_mutex);
@@ -559,8 +559,8 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;





	mutex_lock(&pcm_mutex);

	mutex_lock(&pcm_mutex);
@@ -594,8 +594,8 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_platform *platform = socdev->platform;

	struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_codec_dai *codec_dai = machine->codec_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	int ret;

	int ret;





	if (codec_dai->ops.trigger) {

	if (codec_dai->ops.trigger) {
@@ -651,7 +651,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) 




	/* mute any active DAC's */

	/* mute any active DAC's */

	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_codec_dai *dai = machine->dai_link[i].codec_dai;

		struct snd_soc_dai *dai = machine->dai_link[i].codec_dai;

		if (dai->dai_ops.digital_mute && dai->playback.active)

		if (dai->dai_ops.digital_mute && dai->playback.active)

			dai->dai_ops.digital_mute(dai, 1);

			dai->dai_ops.digital_mute(dai, 1);

	}

	}
@@ -664,7 +664,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) 
		machine->suspend_pre(pdev, state);

		machine->suspend_pre(pdev, state);





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai  *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai  *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->suspend && cpu_dai->type != SND_SOC_DAI_AC97)

		if (cpu_dai->suspend && cpu_dai->type != SND_SOC_DAI_AC97)

			cpu_dai->suspend(pdev, cpu_dai);

			cpu_dai->suspend(pdev, cpu_dai);

		if (platform->suspend)

		if (platform->suspend)
@@ -690,7 +690,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state) 
		codec_dev->suspend(pdev, state);

		codec_dev->suspend(pdev, state);





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->suspend && cpu_dai->type == SND_SOC_DAI_AC97)

		if (cpu_dai->suspend && cpu_dai->type == SND_SOC_DAI_AC97)

			cpu_dai->suspend(pdev, cpu_dai);

			cpu_dai->suspend(pdev, cpu_dai);

	}

	}
@@ -726,7 +726,7 @@ static void soc_resume_deferred(struct work_struct *work) 
		machine->resume_pre(pdev);

		machine->resume_pre(pdev);





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->resume && cpu_dai->type == SND_SOC_DAI_AC97)

		if (cpu_dai->resume && cpu_dai->type == SND_SOC_DAI_AC97)

			cpu_dai->resume(pdev, cpu_dai);

			cpu_dai->resume(pdev, cpu_dai);

	}

	}
@@ -747,13 +747,13 @@ static void soc_resume_deferred(struct work_struct *work) 




	/* unmute any active DACs */

	/* unmute any active DACs */

	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_codec_dai *dai = machine->dai_link[i].codec_dai;

		struct snd_soc_dai *dai = machine->dai_link[i].codec_dai;

		if (dai->dai_ops.digital_mute && dai->playback.active)

		if (dai->dai_ops.digital_mute && dai->playback.active)

			dai->dai_ops.digital_mute(dai, 0);

			dai->dai_ops.digital_mute(dai, 0);

	}

	}





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->resume && cpu_dai->type != SND_SOC_DAI_AC97)

		if (cpu_dai->resume && cpu_dai->type != SND_SOC_DAI_AC97)

			cpu_dai->resume(pdev, cpu_dai);

			cpu_dai->resume(pdev, cpu_dai);

		if (platform->resume)

		if (platform->resume)
@@ -803,7 +803,7 @@ static int soc_probe(struct platform_device *pdev) 
	}

	}





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->probe) {

		if (cpu_dai->probe) {

			ret = cpu_dai->probe(pdev, cpu_dai);

			ret = cpu_dai->probe(pdev, cpu_dai);

			if (ret < 0)

			if (ret < 0)
@@ -838,7 +838,7 @@ static int soc_probe(struct platform_device *pdev) 




cpu_dai_err:

cpu_dai_err:

	for (i--; i >= 0; i--) {

	for (i--; i >= 0; i--) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->remove)

		if (cpu_dai->remove)

			cpu_dai->remove(pdev, cpu_dai);

			cpu_dai->remove(pdev, cpu_dai);

	}

	}
@@ -867,7 +867,7 @@ static int soc_remove(struct platform_device *pdev) 
		codec_dev->remove(pdev);

		codec_dev->remove(pdev);





	for (i = 0; i < machine->num_links; i++) {

	for (i = 0; i < machine->num_links; i++) {

		struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;

		if (cpu_dai->remove)

		if (cpu_dai->remove)

			cpu_dai->remove(pdev, cpu_dai);

			cpu_dai->remove(pdev, cpu_dai);

	}

	}
@@ -895,8 +895,8 @@ static int soc_new_pcm(struct snd_soc_device *socdev, 
	struct snd_soc_dai_link *dai_link, int num)

	struct snd_soc_dai_link *dai_link, int num)

{

{

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec_dai *codec_dai = dai_link->codec_dai;

	struct snd_soc_dai *codec_dai = dai_link->codec_dai;

	struct snd_soc_cpu_dai *cpu_dai = dai_link->cpu_dai;

	struct snd_soc_dai *cpu_dai = dai_link->cpu_dai;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_pcm *pcm;

	struct snd_pcm *pcm;

	char new_name[64];

	char new_name[64];
@@ -1211,7 +1211,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev) 
{

{

	struct snd_soc_codec *codec = socdev->codec;

	struct snd_soc_codec *codec = socdev->codec;

#ifdef CONFIG_SND_SOC_AC97_BUS

#ifdef CONFIG_SND_SOC_AC97_BUS

	struct snd_soc_codec_dai *codec_dai;

	struct snd_soc_dai *codec_dai;

	int i;

	int i;

#endif

#endif