Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342772
b: refs/heads/master
c: 8d47e8a
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Oct 15, 2012
1 parent a33ad4c commit c378aaa
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b138707874729473bed70561c88566821156d6a6
refs/heads/master: 8d47e8a5237712ac31ba0e4894d822b2f6db2d93
46 changes: 46 additions & 0 deletions trunk/sound/soc/samsung/bells.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ struct bells_drvdata {
int asyncclk_rate;
};

static struct bells_drvdata wm2200_drvdata = {
.sysclk_rate = 22579200,
};

static struct bells_drvdata wm5102_drvdata = {
.sysclk_rate = 45158400,
.asyncclk_rate = 49152000,
Expand Down Expand Up @@ -223,6 +227,30 @@ static const struct snd_soc_pcm_stream sub_params = {
.channels_max = 2,
};

static struct snd_soc_dai_link bells_dai_wm2200[] = {
{
.name = "CPU-DSP",
.stream_name = "CPU-DSP",
.cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm0010-sdi1",
.platform_name = "samsung-audio",
.codec_name = "spi0.0",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
},
{
.name = "DSP-CODEC",
.stream_name = "DSP-CODEC",
.cpu_dai_name = "wm0010-sdi2",
.codec_dai_name = "wm2200",
.codec_name = "wm2200.1-003a",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params,
.ignore_suspend = 1,
},
};

static struct snd_soc_dai_link bells_dai_wm5102[] = {
{
.name = "CPU-DSP",
Expand Down Expand Up @@ -327,6 +355,24 @@ static struct snd_soc_dapm_route bells_routes[] = {
};

static struct snd_soc_card bells_cards[] = {
{
.name = "Bells WM2200",
.owner = THIS_MODULE,
.dai_link = bells_dai_wm2200,
.num_links = ARRAY_SIZE(bells_dai_wm2200),
.codec_conf = bells_codec_conf,
.num_configs = ARRAY_SIZE(bells_codec_conf),

.late_probe = bells_late_probe,

.dapm_routes = bells_routes,
.num_dapm_routes = ARRAY_SIZE(bells_routes),

.set_bias_level = bells_set_bias_level,
.set_bias_level_post = bells_set_bias_level_post,

.drvdata = &wm2200_drvdata,
},
{
.name = "Bells WM5102",
.owner = THIS_MODULE,
Expand Down

0 comments on commit c378aaa

Please sign in to comment.