Skip to content

Commit

Permalink
ALSA: asoc: core - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
Browse files Browse the repository at this point in the history 
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: Liam Girdwood <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>
  • Loading branch information
@perexg
Liam Girdwood authored and perexg committed Jul 10, 2008
1 parent a530218 commit 3c4b266
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 73 deletions.
71 changes: 23 additions & 48 deletions include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ struct snd_soc_pcm_stream;
struct snd_soc_ops;
struct snd_soc_dai_mode;
struct snd_soc_pcm_runtime;
struct snd_soc_codec_dai;
struct snd_soc_cpu_dai;
struct snd_soc_dai;
struct snd_soc_codec;
struct snd_soc_machine_config;
struct soc_enum;
Expand Down Expand Up @@ -317,64 +316,38 @@ struct snd_soc_ops {
/* ASoC DAI ops */
struct snd_soc_dai_ops {
/* 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 (*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 (*set_clkdiv)(struct snd_soc_codec_dai *codec_dai,
int div_id, int div);
int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);

/* DAI format configuration */
int (*set_fmt)(struct snd_soc_codec_dai *codec_dai,
unsigned int fmt);
int (*set_tdm_slot)(struct snd_soc_codec_dai *codec_dai,
int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
int (*set_tdm_slot)(struct snd_soc_dai *dai,
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 */
int (*digital_mute)(struct snd_soc_codec_dai *, int mute);
int (*digital_mute)(struct snd_soc_dai *dai, int mute);
};

/* SoC Codec DAI */
struct snd_soc_codec_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 {

/* SoC DAI (Digital Audio Interface) */
struct snd_soc_dai {
/* DAI description */
char *name;
unsigned int id;
unsigned char type;

/* DAI callbacks */
int (*probe)(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai);
struct snd_soc_dai *dai);
void (*remove)(struct platform_device *pdev,
struct snd_soc_cpu_dai *dai);
struct snd_soc_dai *dai);
int (*suspend)(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai);
struct snd_soc_dai *dai);
int (*resume)(struct platform_device *pdev,
struct snd_soc_cpu_dai *cpu_dai);
struct snd_soc_dai *dai);

/* ops */
struct snd_soc_ops ops;
Expand All @@ -386,7 +359,9 @@ struct snd_soc_cpu_dai {

/* DAI runtime info */
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;

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

/* codec DAI's */
struct snd_soc_codec_dai *dai;
struct snd_soc_dai *dai;
unsigned int num_dai;
};

Expand All @@ -447,12 +422,12 @@ struct snd_soc_platform {
int (*probe)(struct platform_device *pdev);
int (*remove)(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,
struct snd_soc_cpu_dai *cpu_dai);
struct snd_soc_dai *dai);

/* 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 *);
void (*pcm_free)(struct snd_pcm *);

Expand All @@ -466,8 +441,8 @@ struct snd_soc_dai_link {
char *stream_name; /* Stream name */

/* DAI */
struct snd_soc_codec_dai *codec_dai;
struct snd_soc_cpu_dai *cpu_dai;
struct snd_soc_dai *codec_dai;
struct snd_soc_dai *cpu_dai;

/* machine stream operations */
struct snd_soc_ops *ops;
Expand Down
50 changes: 25 additions & 25 deletions sound/soc/soc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret = 0;

mutex_lock(&pcm_mutex);
Expand Down Expand Up @@ -272,7 +272,7 @@ static void close_delayed_work(struct work_struct *work)
struct snd_soc_device *socdev =
container_of(work, struct snd_soc_device, delayed_work.work);
struct snd_soc_codec *codec = socdev->codec;
struct snd_soc_codec_dai *codec_dai;
struct snd_soc_dai *codec_dai;
int i;

mutex_lock(&pcm_mutex);
Expand Down Expand Up @@ -323,8 +323,8 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec;

mutex_lock(&pcm_mutex);
Expand Down Expand Up @@ -384,8 +384,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec;
int ret = 0;

Expand Down Expand Up @@ -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_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret = 0;

mutex_lock(&pcm_mutex);
Expand Down Expand Up @@ -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_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec;

mutex_lock(&pcm_mutex);
Expand Down Expand Up @@ -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_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform;
struct snd_soc_cpu_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_codec_dai *codec_dai = machine->codec_dai;
struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret;

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

/* mute any active DAC's */
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)
dai->dai_ops.digital_mute(dai, 1);
}
Expand All @@ -664,7 +664,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
machine->suspend_pre(pdev, state);

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)
cpu_dai->suspend(pdev, cpu_dai);
if (platform->suspend)
Expand All @@ -690,7 +690,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
codec_dev->suspend(pdev, state);

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)
cpu_dai->suspend(pdev, cpu_dai);
}
Expand Down Expand Up @@ -726,7 +726,7 @@ static void soc_resume_deferred(struct work_struct *work)
machine->resume_pre(pdev);

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)
cpu_dai->resume(pdev, cpu_dai);
}
Expand All @@ -747,13 +747,13 @@ static void soc_resume_deferred(struct work_struct *work)

/* unmute any active DACs */
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)
dai->dai_ops.digital_mute(dai, 0);
}

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)
cpu_dai->resume(pdev, cpu_dai);
if (platform->resume)
Expand Down Expand Up @@ -803,7 +803,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;
struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
if (cpu_dai->probe) {
ret = cpu_dai->probe(pdev, cpu_dai);
if (ret < 0)
Expand Down Expand Up @@ -838,7 +838,7 @@ static int soc_probe(struct platform_device *pdev)

cpu_dai_err:
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)
cpu_dai->remove(pdev, cpu_dai);
}
Expand Down Expand Up @@ -867,7 +867,7 @@ static int soc_remove(struct platform_device *pdev)
codec_dev->remove(pdev);

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)
cpu_dai->remove(pdev, cpu_dai);
}
Expand Down Expand Up @@ -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_codec *codec = socdev->codec;
struct snd_soc_codec_dai *codec_dai = dai_link->codec_dai;
struct snd_soc_cpu_dai *cpu_dai = dai_link->cpu_dai;
struct snd_soc_dai *codec_dai = dai_link->codec_dai;
struct snd_soc_dai *cpu_dai = dai_link->cpu_dai;
struct snd_soc_pcm_runtime *rtd;
struct snd_pcm *pcm;
char new_name[64];
Expand Down Expand Up @@ -1211,7 +1211,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev)
{
struct snd_soc_codec *codec = socdev->codec;
#ifdef CONFIG_SND_SOC_AC97_BUS
struct snd_soc_codec_dai *codec_dai;
struct snd_soc_dai *codec_dai;
int i;
#endif

Expand Down

0 comments on commit 3c4b266

Please sign in to comment.